From 812c54ee236a05280f7bc2dd72b7554b9b556189 Mon Sep 17 00:00:00 2001 From: varshaprasad96 Date: Thu, 4 Feb 2021 15:44:43 -0800 Subject: [PATCH] Fix makefile in Ansible and Helm Remove the shell specification in ansible and helm makefiles. Signed-off-by: varshaprasad96 --- .../plugins/ansible/v1/scaffolds/internal/templates/makefile.go | 2 -- .../plugins/helm/v1/scaffolds/internal/templates/makefile.go | 2 -- testdata/ansible/memcached-operator/Makefile | 2 -- testdata/helm/memcached-operator/Makefile | 2 -- 4 files changed, 8 deletions(-) diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go index f304723d05..48783d276e 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go +++ b/internal/plugins/ansible/v1/scaffolds/internal/templates/makefile.go @@ -99,8 +99,6 @@ docker-build: docker-push: docker push ${IMG} -PATH := $(PATH):$(PWD)/bin -SHELL := env PATH=$(PATH) /bin/sh OS := $(shell uname -s | tr '[:upper:]' '[:lower:]') ARCH := $(shell uname -m | sed 's/x86_64/amd64/') diff --git a/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go b/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go index 309a7aad34..a38f8a6ee1 100644 --- a/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go +++ b/internal/plugins/helm/v1/scaffolds/internal/templates/makefile.go @@ -99,8 +99,6 @@ docker-build: docker-push: docker push ${IMG} -PATH := $(PATH):$(PWD)/bin -SHELL := env PATH=$(PATH) /bin/sh OS := $(shell uname -s | tr '[:upper:]' '[:lower:]') ARCH := $(shell uname -m | sed 's/x86_64/amd64/') diff --git a/testdata/ansible/memcached-operator/Makefile b/testdata/ansible/memcached-operator/Makefile index b0ae3dc7ab..47935ec3e3 100644 --- a/testdata/ansible/memcached-operator/Makefile +++ b/testdata/ansible/memcached-operator/Makefile @@ -62,8 +62,6 @@ docker-build: docker-push: docker push ${IMG} -PATH := $(PATH):$(PWD)/bin -SHELL := env PATH=$(PATH) /bin/sh OS := $(shell uname -s | tr '[:upper:]' '[:lower:]') ARCH := $(shell uname -m | sed 's/x86_64/amd64/') diff --git a/testdata/helm/memcached-operator/Makefile b/testdata/helm/memcached-operator/Makefile index 0015500f47..903cfe6b20 100644 --- a/testdata/helm/memcached-operator/Makefile +++ b/testdata/helm/memcached-operator/Makefile @@ -62,8 +62,6 @@ docker-build: docker-push: docker push ${IMG} -PATH := $(PATH):$(PWD)/bin -SHELL := env PATH=$(PATH) /bin/sh OS := $(shell uname -s | tr '[:upper:]' '[:lower:]') ARCH := $(shell uname -m | sed 's/x86_64/amd64/')