Skip to content

Commit

Permalink
fix matchLabel on argocd-operator-controller-manager deployment (#1302)
Browse files Browse the repository at this point in the history
  • Loading branch information
reginapizza authored Apr 11, 2024
1 parent 5f2bde8 commit 10733f1
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
10 changes: 6 additions & 4 deletions bundle/manifests/argocd-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion common/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion deploy/catalog_source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down

0 comments on commit 10733f1

Please sign in to comment.