Fix export image

Signed-off-by: Siddhesh Ghadi <[email protected]>
argoproj-labs · Dec 20, 2024 · 8d932be · 8d932be
1 parent f64ce20
commit 8d932be
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/build/util/Dockerfile b/build/util/Dockerfile
@@ -1,5 +1,8 @@
-# Argo CD v2.13.1
-FROM quay.io/argoproj/argocd@sha256:19608c266cc41e4986d9b1c2b79ea4c42bb9430269eefc5005e9d65be4d22868 as argocd
+# Pin Argo CD to v2.12.x. From v2.13.x, few things have changed with
+# argocd admin export command resulting into issues for export job.
+# https://github.com/argoproj-labs/argocd-operator/issues/1631 
+# Argo CD v2.12.3
+FROM quay.io/argoproj/argocd@sha256:68894064bc381c19ea951029510aa614bd26bf46c2ec65ea445c7d8d095a9417 as argocd
 
 # Final Image
 FROM docker.io/library/ubuntu:24.04

diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml
@@ -247,7 +247,7 @@ metadata:
     capabilities: Deep Insights
     categories: Integration & Delivery
     certified: "false"
-    createdAt: "2024-12-19T08:15:44Z"
+    createdAt: "2024-12-20T07:08:43Z"
     description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
     operators.operatorframework.io/builder: operator-sdk-v1.35.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
@@ -1901,7 +1901,7 @@ spec:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: ENABLE_CONVERSION_WEBHOOK
                   value: "true"
-                image: quay.io/argoprojlabs/argocd-operator@sha256:ef1e83a2a0004ef59ca3d8f718a34f675b15fe72bd84327d2e105dd58af27bd6
+                image: quay.io/argoprojlabs/argocd-operator@sha256:d7f62482426bd8a1ff99f193f199b11e295a1f9093a8b65fa14ada7eec77e1a3
                 livenessProbe:
                   httpGet:
                     path: /healthz

diff --git a/common/defaults.go b/common/defaults.go
@@ -128,7 +128,7 @@ const (
 	ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util"
 
 	// ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified.
-	ArgoCDDefaultExportJobVersion = "sha256:4a5950613192895ba75903424d7966283e3832144ed8a89e1dfb6edde5ca2e42" // 0.13.0
+	ArgoCDDefaultExportJobVersion = "sha256:0745934cb55d95c266daa5423ece9c149bb67db99eb2b3d9215597903724c636" // 0.13.0
 
 	// ArgoCDDefaultExportLocalCapicity is the default capacity to use for local export.
 	ArgoCDDefaultExportLocalCapicity = "2Gi"

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -11,6 +11,6 @@ configMapGenerator:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
-- digest: sha256:ef1e83a2a0004ef59ca3d8f718a34f675b15fe72bd84327d2e105dd58af27bd6
+- digest: sha256:d7f62482426bd8a1ff99f193f199b11e295a1f9093a8b65fa14ada7eec77e1a3
   name: controller
   newName: quay.io/argoprojlabs/argocd-operator
diff --git a/deploy/catalog_source.yaml b/deploy/catalog_source.yaml
@@ -4,6 +4,6 @@ metadata:
   name: argocd-catalog
 spec:
   sourceType: grpc
-  image: quay.io/argoprojlabs/argocd-operator-registry@sha256:832f7d9edb0f20c10d3bef29f6acd64453bc299a732c615cf81d3cc67aec1338 # 0.13.0
+  image: quay.io/argoprojlabs/argocd-operator-registry@sha256:f0d2bb73e8b9d0561c931b2f2afc81cf28ca5711c476b02ac1887770e799ab92 # 0.13.0
   displayName: Argo CD Operators
   publisher: Argo CD Community
diff --git a/deploy/olm-catalog/argocd-operator/0.13.0/argocd-operator.v0.13.0.clusterserviceversion.yaml b/deploy/olm-catalog/argocd-operator/0.13.0/argocd-operator.v0.13.0.clusterserviceversion.yaml
@@ -247,7 +247,7 @@ metadata:
     capabilities: Deep Insights
     categories: Integration & Delivery
     certified: "false"
-    createdAt: "2024-12-19T08:15:44Z"
+    createdAt: "2024-12-20T07:08:43Z"
     description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
     operators.operatorframework.io/builder: operator-sdk-v1.35.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
@@ -1901,7 +1901,7 @@ spec:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: ENABLE_CONVERSION_WEBHOOK
                   value: "true"
-                image: quay.io/argoprojlabs/argocd-operator@sha256:ef1e83a2a0004ef59ca3d8f718a34f675b15fe72bd84327d2e105dd58af27bd6
+                image: quay.io/argoprojlabs/argocd-operator@sha256:d7f62482426bd8a1ff99f193f199b11e295a1f9093a8b65fa14ada7eec77e1a3
                 livenessProbe:
                   httpGet:
                     path: /healthz