From 7d1dba0b6c1f9beccb080ba0413d3304d234d735 Mon Sep 17 00:00:00 2001 From: Aitor Perez Cedres Date: Fri, 28 Jan 2022 16:32:50 +0000 Subject: [PATCH 1/3] Helper overlay to patch the Operator image This will be used in the pipeline to publish to additional registries. [#689] Signed-off-by: Aitor Perez Cedres --- config/ytt/overlay-manager-image.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 config/ytt/overlay-manager-image.yaml diff --git a/config/ytt/overlay-manager-image.yaml b/config/ytt/overlay-manager-image.yaml new file mode 100644 index 000000000..b5741e64a --- /dev/null +++ b/config/ytt/overlay-manager-image.yaml @@ -0,0 +1,13 @@ +#@ load("@ytt:overlay", "overlay") +#@ load("@ytt:data", "data") + +#@overlay/match by=overlay.subset({"kind": "Deployment"}), expects="1+" +--- +spec: + template: + spec: + containers: + #@overlay/match by="name", expects="1+" + - name: operator + image: #@ data.values.operator_image + From 365ab6b134fe05b00204ed8f29b3381789611152 Mon Sep 17 00:00:00 2001 From: Aitor Perez Cedres Date: Fri, 28 Jan 2022 17:13:23 +0000 Subject: [PATCH 2/3] More precise overlay matching Just to ensure we target the expected Deployment object, in case multiple Deployment objects are added in the future. Signed-off-by: Aitor Perez Cedres --- config/ytt/overlay-manager-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ytt/overlay-manager-image.yaml b/config/ytt/overlay-manager-image.yaml index b5741e64a..e39c255b7 100644 --- a/config/ytt/overlay-manager-image.yaml +++ b/config/ytt/overlay-manager-image.yaml @@ -1,7 +1,7 @@ #@ load("@ytt:overlay", "overlay") #@ load("@ytt:data", "data") -#@overlay/match by=overlay.subset({"kind": "Deployment"}), expects="1+" +#@overlay/match by=overlay.subset({"kind": "Deployment", "metadata":{"name": "rabbitmq-cluster-operator"}}), expects="1+" --- spec: template: From 56dcbe327c0573c2ffa065bbd819e90e7e34a735 Mon Sep 17 00:00:00 2001 From: Aitor Perez Cedres Date: Mon, 31 Jan 2022 12:55:53 +0000 Subject: [PATCH 3/3] Generate quay.io registry manifests for installation Signed-off-by: Aitor Perez Cedres --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 6b8cb85c2..65b4ab1b3 100644 --- a/Makefile +++ b/Makefile @@ -102,10 +102,12 @@ deploy-kind: check-env-docker-repo git-commit-sha manifests deploy-namespace-rba kustomize build config/crd | kubectl apply -f - kustomize build config/default/overlays/kind | sed 's@((operator_docker_image))@"$(DOCKER_REGISTRY_SERVER)/$(OPERATOR_IMAGE):$(GIT_COMMIT)"@' | kubectl apply -f - +QUAY_IO_OPERATOR_IMAGE ?= quay.io/rabbitmqoperator/cluster-operator:latest # Builds a single-file installation manifest to deploy the Operator generate-installation-manifest: mkdir -p releases kustomize build config/installation/ > releases/rabbitmq-cluster-operator.yaml + ytt -f releases/rabbitmq-cluster-operator.yaml -f config/ytt/overlay-manager-image.yaml --data-value operator_image=$(QUAY_IO_OPERATOR_IMAGE) > releases/rabbitmq-cluster-operator-quay-io.yaml # Build the docker image docker-build: check-env-docker-repo git-commit-sha