Skip to content

Commit 0ec43fb

Browse files
committed
Add flag for ignore-not-found to make undeploy
1 parent 9817db7 commit 0ec43fb

File tree

30 files changed

+47
-18
lines changed

30 files changed

+47
-18
lines changed

docs/book/src/cronjob-tutorial/testdata/project/api/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/plugins/golang/v2/scaffolds/internal/templates/makefile.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,11 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
131131
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
132132
$(KUSTOMIZE) build config/default | kubectl apply -f -
133133
134-
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
135-
$(KUSTOMIZE) build config/default | kubectl delete -f -
136134
135+
KB_UNDEPLOY_IGNORE_NOT_FOUND ?= 0
136+
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
137+
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(KB_UNDEPLOY_IGNORE_NOT_FOUND) -f -
138+
137139
138140
controller-gen: ## Download controller-gen locally if necessary.
139141
ifeq (, $(shell which controller-gen))

pkg/plugins/golang/v3/scaffolds/internal/templates/makefile.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
139139
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
140140
$(KUSTOMIZE) build config/default | kubectl apply -f -
141141
142+
KB_UNDEPLOY_IGNORE_NOT_FOUND ?= 0
142143
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
143-
$(KUSTOMIZE) build config/default | kubectl delete -f -
144-
144+
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(KB_UNDEPLOY_IGNORE_NOT_FOUND) -f -
145145
146146
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
147147
controller-gen: ## Download controller-gen locally if necessary.

testdata/project-v2-addon/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
7575
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
7676
$(KUSTOMIZE) build config/default | kubectl apply -f -
7777

78-
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
79-
$(KUSTOMIZE) build config/default | kubectl delete -f -
8078

79+
KB_UNDEPLOY_IGNORE_NOT_FOUND ?= 0
80+
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
81+
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(KB_UNDEPLOY_IGNORE_NOT_FOUND) -f -
82+
8183

8284
controller-gen: ## Download controller-gen locally if necessary.
8385
ifeq (, $(shell which controller-gen))

testdata/project-v2-addon/api/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v2-multigroup/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
7575
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
7676
$(KUSTOMIZE) build config/default | kubectl apply -f -
7777

78-
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
79-
$(KUSTOMIZE) build config/default | kubectl delete -f -
8078

79+
KB_UNDEPLOY_IGNORE_NOT_FOUND ?= 0
80+
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
81+
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(KB_UNDEPLOY_IGNORE_NOT_FOUND) -f -
82+
8183

8284
controller-gen: ## Download controller-gen locally if necessary.
8385
ifeq (, $(shell which controller-gen))

testdata/project-v2-multigroup/apis/crew/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v2-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v2-multigroup/apis/ship/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v2-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v2-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v2/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
7575
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
7676
$(KUSTOMIZE) build config/default | kubectl apply -f -
7777

78-
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
79-
$(KUSTOMIZE) build config/default | kubectl delete -f -
8078

79+
KB_UNDEPLOY_IGNORE_NOT_FOUND ?= 0
80+
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
81+
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(KB_UNDEPLOY_IGNORE_NOT_FOUND) -f -
82+
8183

8284
controller-gen: ## Download controller-gen locally if necessary.
8385
ifeq (, $(shell which controller-gen))

testdata/project-v2/api/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v3-addon/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
8080
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
8181
$(KUSTOMIZE) build config/default | kubectl apply -f -
8282

83+
KB_UNDEPLOY_IGNORE_NOT_FOUND ?= 0
8384
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
84-
$(KUSTOMIZE) build config/default | kubectl delete -f -
85-
85+
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(KB_UNDEPLOY_IGNORE_NOT_FOUND) -f -
8686

8787
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
8888
controller-gen: ## Download controller-gen locally if necessary.

testdata/project-v3-addon/api/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v3-config/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
8080
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
8181
$(KUSTOMIZE) build config/default | kubectl apply -f -
8282

83+
KB_UNDEPLOY_IGNORE_NOT_FOUND ?= 0
8384
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
84-
$(KUSTOMIZE) build config/default | kubectl delete -f -
85-
85+
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(KB_UNDEPLOY_IGNORE_NOT_FOUND) -f -
8686

8787
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
8888
controller-gen: ## Download controller-gen locally if necessary.

testdata/project-v3-config/api/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v3-multigroup/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
8080
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
8181
$(KUSTOMIZE) build config/default | kubectl apply -f -
8282

83+
KB_UNDEPLOY_IGNORE_NOT_FOUND ?= 0
8384
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
84-
$(KUSTOMIZE) build config/default | kubectl delete -f -
85-
85+
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(KB_UNDEPLOY_IGNORE_NOT_FOUND) -f -
8686

8787
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
8888
controller-gen: ## Download controller-gen locally if necessary.

testdata/project-v3-multigroup/apis/crew/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v3-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v3-multigroup/apis/ship/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v3-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v3-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v3-multigroup/apis/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testdata/project-v3/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
8080
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
8181
$(KUSTOMIZE) build config/default | kubectl apply -f -
8282

83+
KB_UNDEPLOY_IGNORE_NOT_FOUND ?= 0
8384
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
84-
$(KUSTOMIZE) build config/default | kubectl delete -f -
85-
85+
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(KB_UNDEPLOY_IGNORE_NOT_FOUND) -f -
8686

8787
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
8888
controller-gen: ## Download controller-gen locally if necessary.

testdata/project-v3/api/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)