From e0c670ebfcc8925ee6617c0aa1c47e71b947eee5 Mon Sep 17 00:00:00 2001 From: Eric Stroczynski Date: Mon, 18 May 2020 23:02:46 -0700 Subject: [PATCH] makefile: use $(KUSTOMIZE) variable instead of binary name directly --- pkg/scaffold/internal/templates/makefile.go | 2 +- testdata/project-v2-addon/Makefile | 2 +- testdata/project-v2-multigroup/Makefile | 2 +- testdata/project-v2/Makefile | 2 +- testdata/project-v3-addon/Makefile | 2 +- testdata/project-v3-multigroup/Makefile | 2 +- testdata/project-v3/Makefile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/scaffold/internal/templates/makefile.go b/pkg/scaffold/internal/templates/makefile.go index a8f19127aa1..a680b7cd385 100644 --- a/pkg/scaffold/internal/templates/makefile.go +++ b/pkg/scaffold/internal/templates/makefile.go @@ -91,7 +91,7 @@ uninstall: manifests kustomize # Deploy controller in the configured Kubernetes cluster in ~/.kube/config deploy: manifests kustomize - cd config/manager && kustomize edit set image controller=${IMG} + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} $(KUSTOMIZE) build config/default | kubectl apply -f - # Generate manifests e.g. CRD, RBAC etc. diff --git a/testdata/project-v2-addon/Makefile b/testdata/project-v2-addon/Makefile index d546d7bf98a..f6362e191e3 100644 --- a/testdata/project-v2-addon/Makefile +++ b/testdata/project-v2-addon/Makefile @@ -35,7 +35,7 @@ uninstall: manifests kustomize # Deploy controller in the configured Kubernetes cluster in ~/.kube/config deploy: manifests kustomize - cd config/manager && kustomize edit set image controller=${IMG} + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} $(KUSTOMIZE) build config/default | kubectl apply -f - # Generate manifests e.g. CRD, RBAC etc. diff --git a/testdata/project-v2-multigroup/Makefile b/testdata/project-v2-multigroup/Makefile index d546d7bf98a..f6362e191e3 100644 --- a/testdata/project-v2-multigroup/Makefile +++ b/testdata/project-v2-multigroup/Makefile @@ -35,7 +35,7 @@ uninstall: manifests kustomize # Deploy controller in the configured Kubernetes cluster in ~/.kube/config deploy: manifests kustomize - cd config/manager && kustomize edit set image controller=${IMG} + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} $(KUSTOMIZE) build config/default | kubectl apply -f - # Generate manifests e.g. CRD, RBAC etc. diff --git a/testdata/project-v2/Makefile b/testdata/project-v2/Makefile index d546d7bf98a..f6362e191e3 100644 --- a/testdata/project-v2/Makefile +++ b/testdata/project-v2/Makefile @@ -35,7 +35,7 @@ uninstall: manifests kustomize # Deploy controller in the configured Kubernetes cluster in ~/.kube/config deploy: manifests kustomize - cd config/manager && kustomize edit set image controller=${IMG} + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} $(KUSTOMIZE) build config/default | kubectl apply -f - # Generate manifests e.g. CRD, RBAC etc. diff --git a/testdata/project-v3-addon/Makefile b/testdata/project-v3-addon/Makefile index d546d7bf98a..f6362e191e3 100644 --- a/testdata/project-v3-addon/Makefile +++ b/testdata/project-v3-addon/Makefile @@ -35,7 +35,7 @@ uninstall: manifests kustomize # Deploy controller in the configured Kubernetes cluster in ~/.kube/config deploy: manifests kustomize - cd config/manager && kustomize edit set image controller=${IMG} + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} $(KUSTOMIZE) build config/default | kubectl apply -f - # Generate manifests e.g. CRD, RBAC etc. diff --git a/testdata/project-v3-multigroup/Makefile b/testdata/project-v3-multigroup/Makefile index d546d7bf98a..f6362e191e3 100644 --- a/testdata/project-v3-multigroup/Makefile +++ b/testdata/project-v3-multigroup/Makefile @@ -35,7 +35,7 @@ uninstall: manifests kustomize # Deploy controller in the configured Kubernetes cluster in ~/.kube/config deploy: manifests kustomize - cd config/manager && kustomize edit set image controller=${IMG} + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} $(KUSTOMIZE) build config/default | kubectl apply -f - # Generate manifests e.g. CRD, RBAC etc. diff --git a/testdata/project-v3/Makefile b/testdata/project-v3/Makefile index d546d7bf98a..f6362e191e3 100644 --- a/testdata/project-v3/Makefile +++ b/testdata/project-v3/Makefile @@ -35,7 +35,7 @@ uninstall: manifests kustomize # Deploy controller in the configured Kubernetes cluster in ~/.kube/config deploy: manifests kustomize - cd config/manager && kustomize edit set image controller=${IMG} + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} $(KUSTOMIZE) build config/default | kubectl apply -f - # Generate manifests e.g. CRD, RBAC etc.