From 29a9c7ae9d977d4d5f03eaaebc46dbb2b0dea812 Mon Sep 17 00:00:00 2001 From: craig Date: Fri, 27 Oct 2023 16:30:35 +0100 Subject: [PATCH] e2e --- cmd/policy_controller/main.go | 3 +-- hack/make/gateway_controller.make | 2 +- hack/make/policy_controller.make | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/policy_controller/main.go b/cmd/policy_controller/main.go index a5f69059b..0e517c66f 100644 --- a/cmd/policy_controller/main.go +++ b/cmd/policy_controller/main.go @@ -21,11 +21,10 @@ import ( "os" certmanv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" - clusterv1 "open-cluster-management.io/api/cluster/v1" - utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" clientgoscheme "k8s.io/client-go/kubernetes/scheme" + clusterv1 "open-cluster-management.io/api/cluster/v1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/hack/make/gateway_controller.make b/hack/make/gateway_controller.make index 60f7cb828..8b78bcaf4 100644 --- a/hack/make/gateway_controller.make +++ b/hack/make/gateway_controller.make @@ -31,7 +31,7 @@ docker-push-gateway-controller: ## Push docker image with the controller. deploy-gateway-controller: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config. cd config/manager && $(KUSTOMIZE) edit set image controller=${CONTROLLER_IMG} $(KUSTOMIZE) --load-restrictor LoadRestrictionsNone build config/deploy/local | kubectl apply -f - - @if [ $(METRICS) = "true" ]; then\ + @if [ "$(METRICS)" = "true" ]; then\ $(KUSTOMIZE) build config/prometheus | kubectl apply -f -;\ fi diff --git a/hack/make/policy_controller.make b/hack/make/policy_controller.make index 13e25ac75..7a5aaa39e 100644 --- a/hack/make/policy_controller.make +++ b/hack/make/policy_controller.make @@ -29,9 +29,9 @@ docker-push-policy-controller: ## Push docker image with the controller. .PHONY: deploy-policy-controller deploy-policy-controller: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config. - cd config/policy-controller && $(KUSTOMIZE) edit set image controller=${POLICY_CONTROLLER_IMG} + cd config/policy-controller && $(KUSTOMIZE) edit set image policy-controller=${POLICY_CONTROLLER_IMG} $(KUSTOMIZE) --load-restrictor LoadRestrictionsNone build config/deploy/local | kubectl apply -f - - @if [ $(METRICS) = "true" ]; then\ + @if [ "$(METRICS)" = "true" ]; then\ $(KUSTOMIZE) build config/prometheus | kubectl apply -f -;\ fi