CLOUDP-362278: Fix RH script quay.io setting (#2978)

* CLOUDP-362278: Fix RH script quay.io setting

* Also fix the prerelease suffix

Signed-off-by: jose.vazquez <[email protected]>

---------

Signed-off-by: jose.vazquez <[email protected]>

Author: josvazg

.github/workflows/release-image.yml

@@ -229,6 +229,7 @@ jobs:
           ENV: prod
           VERSION: ${{ env.VERSION }}
           IMAGE_URL: ${{ needs.compute-repo.outputs.repo }}
+          OPERATOR_REGISTRY: ${{ needs.compute-repo.outputs.repo }}
         run: devbox run -- make bundle
 
       - name: Bump Helm chart version

releases/v2.12.0/bundle/manifests/mongodb-atlas-kubernetes.clusterserviceversion.yaml

@@ -547,7 +547,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
     repository: https://github.com/mongodb/mongodb-atlas-kubernetes
     support: [email protected]
-    containerImage: quay.io/mongodb/mongodb-atlas-kubernetes-operator-prerelease:2.12.0
+    containerImage: quay.io/mongodb/mongodb-atlas-kubernetes-operator:2.12.0
   labels:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.arm64: supported
@@ -778,7 +778,7 @@ spec:
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.annotations['olm.targetNamespaces']
-                    image: quay.io/mongodb/mongodb-atlas-kubernetes-operator-prerelease:2.12.0
+                    image: quay.io/mongodb/mongodb-atlas-kubernetes-operator:2.12.0
                     imagePullPolicy: Always
                     livenessProbe:
                       httpGet:

releases/v2.12.0/deploy/all-in-one.yaml

@@ -7407,7 +7407,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/mongodb/mongodb-atlas-kubernetes-operator-prerelease:2.12.0
+        image: quay.io/mongodb/mongodb-atlas-kubernetes-operator:2.12.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

releases/v2.12.0/deploy/clusterwide/clusterwide-config.yaml

@@ -267,7 +267,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/mongodb/mongodb-atlas-kubernetes-operator-prerelease:2.12.0
+        image: quay.io/mongodb/mongodb-atlas-kubernetes-operator:2.12.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

releases/v2.12.0/deploy/namespaced/namespaced-config.yaml

@@ -269,7 +269,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/mongodb/mongodb-atlas-kubernetes-operator-prerelease:2.12.0
+        image: quay.io/mongodb/mongodb-atlas-kubernetes-operator:2.12.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

releases/v2.12.0/deploy/openshift/openshift.yaml

@@ -268,7 +268,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/mongodb/mongodb-atlas-kubernetes-operator-prerelease:2.12.0
+        image: quay.io/mongodb/mongodb-atlas-kubernetes-operator:2.12.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

scripts/release-redhat.sh

@@ -31,10 +31,10 @@ sed -i.bak 's/COPY bundle\/metadata/COPY metadata/' "${version}/bundle.Dockerfil
 sed -i.bak 's/COPY bundle\/tests\/scorecard/COPY tests\/scorecard/' "${version}/bundle.Dockerfile"
 rm "${version}/bundle.Dockerfile.bak"
 
-yq e -i '.metadata.annotations.containerImage = "quay.io/" + .metadata.annotations.containerImage' \
+yq e -i '.metadata.annotations.containerImage = .metadata.annotations.containerImage' \
   "${repo}/${version}"/manifests/mongodb-atlas-kubernetes.clusterserviceversion.yaml
 
-yq e -i '.spec.install.spec.deployments[0].spec.template.spec.containers[0].image = "quay.io/" + .spec.install.spec.deployments[0].spec.template.spec.containers[0].image' \
+yq e -i '.spec.install.spec.deployments[0].spec.template.spec.containers[0].image = .spec.install.spec.deployments[0].spec.template.spec.containers[0].image' \
   "${repo}/${version}"/manifests/mongodb-atlas-kubernetes.clusterserviceversion.yaml
 
 # commit