Merge pull request #193 from rabbitmq/67-kustomize

Remove deprecated `bases` from kustomization files

Author: coro

Makefile

@@ -40,21 +40,21 @@ manager: generate fmt vet
 	go build -o bin/manager main.go
 
 deploy-manager:  ## Deploy manager
-	kubectl apply -k config/crd
-	kubectl apply -k config/default/base
+	kustomize build config/crd | kubectl apply -f -
+	kustomize build config/default/base | kubectl apply -f -
 
 deploy-manager-dev:
-	kubectl apply -k config/crd
-	kubectl apply -k config/default/overlays/dev
+	kustomize build config/crd | kubectl apply -f -
+	kustomize build config/default/overlays/dev | kubectl apply -f -
 
 deploy-sample: ## Deploy RabbitmqCluster defined in config/sample/base
-	kubectl apply -k config/samples/base
+	kustomize build config/samples/base | kubectl apply -f -
 
 destroy: ## Cleanup all controller artefacts
-	kubectl delete -k config/crd/ --ignore-not-found=true
-	kubectl delete -k config/default/base/ --ignore-not-found=true
-	kubectl delete -k config/rbac/ --ignore-not-found=true
-	kubectl delete -k config/namespace/base/ --ignore-not-found=true
+	kustomize build config/crd/ | kubectl delete --ignore-not-found=true -f -
+	kustomize build config/default/base/ | kubectl delete --ignore-not-found=true -f -
+	kustomize build config/rbac/ | kubectl delete --ignore-not-found=true -f -
+	kustomize build config/namespace/base/ | kubectl delete --ignore-not-found=true -f -
 
 run: generate manifests fmt vet install deploy-namespace-rbac just-run ## Run operator binary locally against the configured Kubernetes cluster in ~/.kube/config
 
@@ -71,11 +71,11 @@ install: manifests
 	kubectl apply -f config/crd/bases
 
 deploy-namespace-rbac:
-	kubectl apply -k config/namespace/base
-	kubectl apply -k config/rbac
+	kustomize build config/namespace/base | kubectl apply -f -
+	kustomize build config/rbac | kubectl apply -f -
 
 deploy-master: install deploy-namespace-rbac docker-registry-secret
-	kubectl apply -k config/default/base
+	kustomize build config/default/base | kubectl apply -f -
 
 deploy: manifests deploy-namespace-rbac docker-registry-secret deploy-manager ## Deploy operator in the configured Kubernetes cluster in ~/.kube/config
 
@@ -84,8 +84,8 @@ deploy-dev: docker-build-dev patch-dev manifests deploy-namespace-rbac docker-re
 deploy-kind: git-commit-sha patch-kind manifests deploy-namespace-rbac ## Load operator image and deploy operator into current KinD cluster
 	docker build --build-arg=GIT_COMMIT=$(GIT_COMMIT) -t $(DOCKER_REGISTRY_SERVER)/$(OPERATOR_IMAGE):$(GIT_COMMIT) .
 	kind load docker-image $(DOCKER_REGISTRY_SERVER)/$(OPERATOR_IMAGE):$(GIT_COMMIT)
-	kubectl apply -k config/crd
-	kubectl apply -k config/default/overlays/kind
+	kustomize build config/crd | kubectl apply -f -
+	kustomize build config/default/overlays/kind | kubectl apply -f -
 
 generate-installation-manifests:
 	mkdir -p installation

config/default/base/kustomization.yaml

@@ -8,7 +8,7 @@
 
 namespace: rabbitmq-system
 namePrefix: rabbitmq-cluster-
-bases:
+resources:
 # - ../../rbac
 - ../../manager
 # [WEBHOOK] Uncomment all the sections with [WEBHOOK] prefix to enable webhook.

config/default/overlays/dev/kustomization.yaml

@@ -7,7 +7,7 @@
 # This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
 namespace: rabbitmq-system
 
-bases:
+resources:
 - ../../base
 
 patches:

config/default/overlays/helm/kustomization.yaml

@@ -7,11 +7,9 @@
 # This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
 namespace: rabbitmq-system
 
-bases:
-- ../../base
-
 resources:
 - image_pull_secret.yml
+- ../../base
 
 patches:
 - image_as_helm_template.yml

config/default/overlays/kind/kustomization.yaml

@@ -7,7 +7,7 @@
 # This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
 namespace: rabbitmq-system
 
-bases:
+resources:
 - ../../base
 
 patches:

config/installation/kustomization.yaml

@@ -7,7 +7,7 @@
 # This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
 #
 
-bases:
+resources:
 - ../default/base
 
 namespace: rabbitmq-system

config/installation/overlay/ci/kustomization.yaml

@@ -5,7 +5,7 @@
 # This product is licensed to you under the Mozilla Public license, Version 2.0 (the "License").  You may not use this product except in compliance with the Mozilla Public License.
 #
 # This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
-bases:
+resources:
 - ../../../default/base
 
 namespace: rabbitmq-system

config/samples/overlays/ci/kustomization.yaml

@@ -7,5 +7,5 @@
 #
 # This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
 namespace: rabbitmq-system-ci
-bases:
+resources:
 - ../../base