workaround: various workarounds to make the CI/CD work

Signed-off-by: Armando Ruocco <[email protected]>
EnterpriseDB · Aug 7, 2023 · 4bae2cf · 4bae2cf
1 parent c285516
commit 4bae2cf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -138,7 +138,7 @@ generate-manifest: manifests kustomize ## Generate manifest used for deployment.
 		cd $$CONFIG_TMP_DIR/default ;\
 		$(KUSTOMIZE) edit add patch --path manager_image_pull_secret.yaml ;\
 		cd $$CONFIG_TMP_DIR/manager ;\
-		$(KUSTOMIZE) edit set image controller="${CONTROLLER_IMG}" ;\
+		$(KUSTOMIZE) edit set image controller="controller=ghcr.io/cloudnative-pg/cloudnative-pg-testing:pr-2528" ;\
 		$(KUSTOMIZE) edit add patch --path env_override.yaml ;\
 		$(KUSTOMIZE) edit add configmap controller-manager-env \
 			--from-literal="POSTGRES_IMAGE_NAME=${POSTGRES_IMAGE_NAME}" ;\

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -35,13 +35,15 @@ spec:
       containers:
       - command:
         - /manager
+        imagePullPolicy: Always
         args:
         - controller
         - --leader-elect
         - --config-map-name=$(OPERATOR_DEPLOYMENT_NAME)-config
         - --secret-name=$(OPERATOR_DEPLOYMENT_NAME)-config
         - --webhook-port=9443
-        image: controller:latest
+        # TODO: remove before merging
+        image: ghcr.io/cloudnative-pg/cloudnative-pg-testing:pr-2528
         name: manager
         ports:
           - containerPort: 8080

diff --git a/hack/e2e/run-e2e.sh b/hack/e2e/run-e2e.sh
@@ -84,7 +84,7 @@ if [[ "${TEST_UPGRADE_TO_V1}" != "false" ]]; then
       cd "${CONFIG_TMP_DIR}/default"
       "${KUSTOMIZE}" edit add patch --path manager_image_pull_secret.yaml
       cd "${CONFIG_TMP_DIR}/manager"
-      "${KUSTOMIZE}" edit set image "controller=${CONTROLLER_IMG}"
+      "${KUSTOMIZE}" edit set image "controller=ghcr.io/cloudnative-pg/cloudnative-pg-testing:pr-2528"
       "${KUSTOMIZE}" edit add patch --path env_override.yaml
       "${KUSTOMIZE}" edit add configmap controller-manager-env \
         --from-literal="POSTGRES_IMAGE_NAME=${POSTGRES_IMG}"