fix matchLabel on argocd-operator-controller-manager deployment (#1302)

argoproj-labs · Apr 11, 2024 · 10733f1 · 10733f1
1 parent 5f2bde8
commit 10733f1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml
@@ -1718,17 +1718,19 @@ spec:
           - create
         serviceAccountName: argocd-operator-controller-manager
       deployments:
-      - name: argocd-operator-controller-manager
+      - label:
+          control-plane: controller-manager
+        name: argocd-operator-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              control-plane: argocd-operator
+              control-plane: controller-manager
           strategy: {}
           template:
             metadata:
               labels:
-                control-plane: argocd-operator
+                control-plane: controller-manager
             spec:
               containers:
               - args:
@@ -1742,7 +1744,7 @@ spec:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: ENABLE_CONVERSION_WEBHOOK
                   value: "true"
-                image: quay.io/argoprojlabs/argocd-operator@sha256:25c71c9f0fbc5203b3ea8021cb770a98642ddf3ee3cc85faac3be642b7183491
+                image: quay.io/argoprojlabs/argocd-operator@sha256:a552e964c4a1fbbe8a34bb20a7a2934137eb114a16fc2993ace8787d6f3c8d83
                 livenessProbe:
                   httpGet:
                     path: /healthz

diff --git a/common/defaults.go b/common/defaults.go
@@ -119,7 +119,7 @@ const (
 	ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util"
 
 	// ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified.
-	ArgoCDDefaultExportJobVersion = "sha256:d27deaedeb31c939e99d9286c02af175fa09df2c269e18e926c08b0dec9cf55f" // 0.9.0
+	ArgoCDDefaultExportJobVersion = "sha256:4e7a457e1c442a724937a1914cd51fbf433629f1ec14815491039b92e0739278" // 0.9.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:25c71c9f0fbc5203b3ea8021cb770a98642ddf3ee3cc85faac3be642b7183491
+- digest: sha256:a552e964c4a1fbbe8a34bb20a7a2934137eb114a16fc2993ace8787d6f3c8d83
   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:245ed329982c091ccd16bc949800c7c7a100c63182c8fbf2306cb8841e6c7dc3 # replace with your index image
+  image: quay.io/argoprojlabs/argocd-operator-registry@sha256:af30d906271eec139f8a3d6863ecb12e58c7aaa7bcd45917af71ac61ea82c126 # replace with your index image
   displayName: Argo CD Operators
   publisher: Argo CD Community
diff --git a/deploy/olm-catalog/argocd-operator/0.9.0/argocd-operator.v0.9.0.clusterserviceversion.yaml b/deploy/olm-catalog/argocd-operator/0.9.0/argocd-operator.v0.9.0.clusterserviceversion.yaml
@@ -1718,17 +1718,19 @@ spec:
           - create
         serviceAccountName: argocd-operator-controller-manager
       deployments:
-      - name: argocd-operator-controller-manager
+      - label:
+          control-plane: controller-manager
+        name: argocd-operator-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              control-plane: argocd-operator
+              control-plane: controller-manager
           strategy: {}
           template:
             metadata:
               labels:
-                control-plane: argocd-operator
+                control-plane: controller-manager
             spec:
               containers:
               - args:
@@ -1742,7 +1744,7 @@ spec:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: ENABLE_CONVERSION_WEBHOOK
                   value: "true"
-                image: quay.io/argoprojlabs/argocd-operator@sha256:25c71c9f0fbc5203b3ea8021cb770a98642ddf3ee3cc85faac3be642b7183491
+                image: quay.io/argoprojlabs/argocd-operator@sha256:a552e964c4a1fbbe8a34bb20a7a2934137eb114a16fc2993ace8787d6f3c8d83
                 livenessProbe:
                   httpGet:
                     path: /healthz