Skip to content

Commit 10733f1

Browse files
authored
fix matchLabel on argocd-operator-controller-manager deployment (#1302)
1 parent 5f2bde8 commit 10733f1

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

bundle/manifests/argocd-operator.clusterserviceversion.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,17 +1718,19 @@ spec:
17181718
- create
17191719
serviceAccountName: argocd-operator-controller-manager
17201720
deployments:
1721-
- name: argocd-operator-controller-manager
1721+
- label:
1722+
control-plane: controller-manager
1723+
name: argocd-operator-controller-manager
17221724
spec:
17231725
replicas: 1
17241726
selector:
17251727
matchLabels:
1726-
control-plane: argocd-operator
1728+
control-plane: controller-manager
17271729
strategy: {}
17281730
template:
17291731
metadata:
17301732
labels:
1731-
control-plane: argocd-operator
1733+
control-plane: controller-manager
17321734
spec:
17331735
containers:
17341736
- args:
@@ -1742,7 +1744,7 @@ spec:
17421744
fieldPath: metadata.annotations['olm.targetNamespaces']
17431745
- name: ENABLE_CONVERSION_WEBHOOK
17441746
value: "true"
1745-
image: quay.io/argoprojlabs/argocd-operator@sha256:25c71c9f0fbc5203b3ea8021cb770a98642ddf3ee3cc85faac3be642b7183491
1747+
image: quay.io/argoprojlabs/argocd-operator@sha256:a552e964c4a1fbbe8a34bb20a7a2934137eb114a16fc2993ace8787d6f3c8d83
17461748
livenessProbe:
17471749
httpGet:
17481750
path: /healthz

common/defaults.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ const (
119119
ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util"
120120

121121
// ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified.
122-
ArgoCDDefaultExportJobVersion = "sha256:d27deaedeb31c939e99d9286c02af175fa09df2c269e18e926c08b0dec9cf55f" // 0.9.0
122+
ArgoCDDefaultExportJobVersion = "sha256:4e7a457e1c442a724937a1914cd51fbf433629f1ec14815491039b92e0739278" // 0.9.0
123123

124124
// ArgoCDDefaultExportLocalCapicity is the default capacity to use for local export.
125125
ArgoCDDefaultExportLocalCapicity = "2Gi"

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ configMapGenerator:
1111
apiVersion: kustomize.config.k8s.io/v1beta1
1212
kind: Kustomization
1313
images:
14-
- digest: sha256:25c71c9f0fbc5203b3ea8021cb770a98642ddf3ee3cc85faac3be642b7183491
14+
- digest: sha256:a552e964c4a1fbbe8a34bb20a7a2934137eb114a16fc2993ace8787d6f3c8d83
1515
name: controller
1616
newName: quay.io/argoprojlabs/argocd-operator

deploy/catalog_source.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ metadata:
44
name: argocd-catalog
55
spec:
66
sourceType: grpc
7-
image: quay.io/argoprojlabs/argocd-operator-registry@sha256:245ed329982c091ccd16bc949800c7c7a100c63182c8fbf2306cb8841e6c7dc3 # replace with your index image
7+
image: quay.io/argoprojlabs/argocd-operator-registry@sha256:af30d906271eec139f8a3d6863ecb12e58c7aaa7bcd45917af71ac61ea82c126 # replace with your index image
88
displayName: Argo CD Operators
99
publisher: Argo CD Community

deploy/olm-catalog/argocd-operator/0.9.0/argocd-operator.v0.9.0.clusterserviceversion.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,17 +1718,19 @@ spec:
17181718
- create
17191719
serviceAccountName: argocd-operator-controller-manager
17201720
deployments:
1721-
- name: argocd-operator-controller-manager
1721+
- label:
1722+
control-plane: controller-manager
1723+
name: argocd-operator-controller-manager
17221724
spec:
17231725
replicas: 1
17241726
selector:
17251727
matchLabels:
1726-
control-plane: argocd-operator
1728+
control-plane: controller-manager
17271729
strategy: {}
17281730
template:
17291731
metadata:
17301732
labels:
1731-
control-plane: argocd-operator
1733+
control-plane: controller-manager
17321734
spec:
17331735
containers:
17341736
- args:
@@ -1742,7 +1744,7 @@ spec:
17421744
fieldPath: metadata.annotations['olm.targetNamespaces']
17431745
- name: ENABLE_CONVERSION_WEBHOOK
17441746
value: "true"
1745-
image: quay.io/argoprojlabs/argocd-operator@sha256:25c71c9f0fbc5203b3ea8021cb770a98642ddf3ee3cc85faac3be642b7183491
1747+
image: quay.io/argoprojlabs/argocd-operator@sha256:a552e964c4a1fbbe8a34bb20a7a2934137eb114a16fc2993ace8787d6f3c8d83
17461748
livenessProbe:
17471749
httpGet:
17481750
path: /healthz

0 commit comments

Comments
 (0)