Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update control plane #1052

Merged
merged 3 commits into from
Nov 20, 2023
Merged

update control plane #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b414e7
update control plane
reginapizza Nov 2, 2023
1b6e17f
update quay repos with correct control-plane reference
reginapizza Nov 2, 2023
685855f
update to new argocd 2.8.6 image SHA
Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/util/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Argo CD v2.8.6
FROM quay.io/argoproj/argocd@sha256:712ff6ac413d74951988fdf82b1c8f433770be4d85b5ed013f848be0c164d0b9 as argocd
FROM quay.io/argoproj/argocd@sha256:acaf3735256979326c8dcd3106454cee65572c40e191525174cba2bcb35541c5 as argocd

# Final Image
FROM docker.io/library/ubuntu:22.04
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/argocd-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1742,7 +1742,7 @@ spec:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: ENABLE_CONVERSION_WEBHOOK
value: "true"
image: quay.io/argoprojlabs/argocd-operator@sha256:6359e98446936109e4c9491a7b919a5eac8ac6cbe737d94583bd979c2071c45f
image: quay.io/argoprojlabs/argocd-operator@sha256:98e86902867f9e4ca86de7a8536d850e298b4d039aee4cd35e70c6af95b39fff
livenessProbe:
httpGet:
path: /healthz
Expand Down
4 changes: 2 additions & 2 deletions common/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const (
ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd"

// ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified.
ArgoCDDefaultArgoVersion = "sha256:712ff6ac413d74951988fdf82b1c8f433770be4d85b5ed013f848be0c164d0b9" // v2.8.6
ArgoCDDefaultArgoVersion = "sha256:acaf3735256979326c8dcd3106454cee65572c40e191525174cba2bcb35541c5" // v2.8.6

// ArgoCDDefaultBackupKeyLength is the length of the generated default backup key.
ArgoCDDefaultBackupKeyLength = 32
Expand Down 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:dfd3833b199a2e452940ed37a6175323e8fb0be5f2c8ea87f1d21330236679f1" // 0.8.0
ArgoCDDefaultExportJobVersion = "sha256:463301e24116f311d6e1f658b197fa46138a028602d2d0e2c7add35d97018e46" // 0.8.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
View file
Open in desktop
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:6359e98446936109e4c9491a7b919a5eac8ac6cbe737d94583bd979c2071c45f
- digest: sha256:98e86902867f9e4ca86de7a8536d850e298b4d039aee4cd35e70c6af95b39fff
name: controller
newName: quay.io/argoprojlabs/argocd-operator
2 changes: 1 addition & 1 deletion deploy/catalog_source.yaml
View file
Open in desktop
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:ccae1c0a80ad5846d73f7fdfcb20947daec2d50274619440011543d0cc527e19 # replace with your index image
image: quay.io/argoprojlabs/argocd-operator-registry@sha256:385a5a88abd3a2121e556cc5aba96d54d610a89d8790e5ecc6145d4cd35f1fbb # replace with your index image
displayName: Argo CD Operators
publisher: Argo CD Community
4 changes: 2 additions & 2 deletions .../argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ kind: Service
metadata:
creationTimestamp: null
labels:
control-plane: argocd-operator
control-plane: controller-manager
name: argocd-operator-controller-manager-metrics-service
spec:
ports:
- name: https
port: 8443
targetPort: 8080
selector:
control-plane: argocd-operator
control-plane: controller-manager
status:
loadBalancer: {}
4 changes: 2 additions & 2 deletions deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1723,12 +1723,12 @@ 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 Down