From 3a879bdd5edd6b45af1ea15b3259d3c38368f324 Mon Sep 17 00:00:00 2001 From: xuezhaojun Date: Tue, 22 Jun 2021 11:13:13 +0800 Subject: [PATCH] Fixed clean-deploy failed Signed-off-by: xuezhaojun --- Makefile | 5 +++-- deploy/klusterlet/config/samples/kustomization.yaml | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fcf9775bd..1b625fd1f 100644 --- a/Makefile +++ b/Makefile @@ -121,14 +121,15 @@ apply-spoke-cr: bootstrap-secret $(KUSTOMIZE) build deploy/klusterlet/config/samples | $(SED_CMD) -e "s,quay.io/open-cluster-management/registration,$(REGISTRATION_IMAGE)," -e "s,quay.io/open-cluster-management/work,$(WORK_IMAGE)," | $(KUBECTL) apply -f - clean-hub-cr: - $(KUBECTL) delete -k deploy/cluster-manager/config/samples --ignore-not-found + $(KUSTOMIZE) build deploy/cluster-manager/config/samples | $(KUBECTL) delete --ignore-not-found -f - clean-hub-operator: $(KUSTOMIZE) build deploy/cluster-manager/config | $(KUBECTL) delete --ignore-not-found -f - clean-spoke-cr: $(KUBECTL) delete managedcluster --all --ignore-not-found - $(KUBECTL) delete -k deploy/klusterlet/config/samples --ignore-not-found + $(KUSTOMIZE) build deploy/klusterlet/config/samples | $(KUBECTL) delete --ignore-not-found -f - + $(KUSTOMIZE) build deploy/klusterlet/config/samples/bootstrap | $(KUBECTL) delete --ignore-not-found -f - clean-spoke-operator: $(KUSTOMIZE) build deploy/klusterlet/config | $(KUBECTL) delete --ignore-not-found -f - diff --git a/deploy/klusterlet/config/samples/kustomization.yaml b/deploy/klusterlet/config/samples/kustomization.yaml index 842efc852..f917c49de 100644 --- a/deploy/klusterlet/config/samples/kustomization.yaml +++ b/deploy/klusterlet/config/samples/kustomization.yaml @@ -1,3 +1,2 @@ resources: - operator_open-cluster-management_klusterlets.cr.yaml - - bootstrap