From 855ecf26a06bebc75b175e1538e0569964929031 Mon Sep 17 00:00:00 2001 From: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> Date: Tue, 5 Nov 2024 23:47:37 -0500 Subject: [PATCH] chore: Upgrade argocd version to 2.12.7 (#1591) * Upgrade argocd version to 2.12.7 Signed-off-by: Ishita Sequeira * revert comment update Signed-off-by: Ishita Sequeira --------- Signed-off-by: Ishita Sequeira --- build/util/Dockerfile | 4 ++-- .../argocd-operator.clusterserviceversion.yaml | 4 ++-- bundle/manifests/argoproj.io_applications.yaml | 10 ++++++++++ common/defaults.go | 2 +- config/crd/bases/argoproj.io_applications.yaml | 10 ++++++++++ config/manager/kustomization.yaml | 4 ++-- .../argocd-operator.v0.12.0.clusterserviceversion.yaml | 4 ++-- .../0.12.0/argoproj.io_applications.yaml | 10 ++++++++++ go.mod | 2 +- go.sum | 4 ++-- 10 files changed, 42 insertions(+), 12 deletions(-) diff --git a/build/util/Dockerfile b/build/util/Dockerfile index 9d0846748..2c9785bf2 100644 --- a/build/util/Dockerfile +++ b/build/util/Dockerfile @@ -1,5 +1,5 @@ -# Argo CD v2.12.6 -FROM quay.io/argoproj/argocd@sha256:86081736f6494292671f079f497f28dd332e2aabdab7d790317b1e5956ad64da as argocd +# Argo CD v2.12.7 +FROM quay.io/argoproj/argocd@sha256:5233625223d3ff51f609353e155407da227b2d8defb125545deb6b652a5f5c8e 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 index d458ea7db..48efb7d03 100644 --- 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-09-30T10:55:59Z" + createdAt: "2024-11-06T02:57:10Z" 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:405e7bde25affb7644c576a7f2d41ba30b88e2ef4f2f11945b920a33517895ce + image: quay.io/argoprojlabs/argocd-operator:v0.12.0 livenessProbe: httpGet: path: /healthz diff --git a/bundle/manifests/argoproj.io_applications.yaml b/bundle/manifests/argoproj.io_applications.yaml index fc06983e5..c09521cbf 100644 --- a/bundle/manifests/argoproj.io_applications.yaml +++ b/bundle/manifests/argoproj.io_applications.yaml @@ -115,6 +115,11 @@ spec: sync: description: Sync contains parameters for the operation properties: + autoHealAttemptsCount: + description: SelfHealAttemptsCount contains the number of auto-heal + attempts + format: int64 + type: integer dryRun: description: DryRun specifies to perform a `kubectl apply --dry-run` without actually performing the sync @@ -2537,6 +2542,11 @@ spec: sync: description: Sync contains parameters for the operation properties: + autoHealAttemptsCount: + description: SelfHealAttemptsCount contains the number + of auto-heal attempts + format: int64 + type: integer dryRun: description: DryRun specifies to perform a `kubectl apply --dry-run` without actually performing the sync diff --git a/common/defaults.go b/common/defaults.go index 1c0439a35..9162029dd 100644 --- a/common/defaults.go +++ b/common/defaults.go @@ -70,7 +70,7 @@ const ( ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd" // ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified. - ArgoCDDefaultArgoVersion = "sha256:86081736f6494292671f079f497f28dd332e2aabdab7d790317b1e5956ad64da" // v2.12.6 + ArgoCDDefaultArgoVersion = "sha256:5233625223d3ff51f609353e155407da227b2d8defb125545deb6b652a5f5c8e" // v2.12.7 // ArgoCDDefaultBackupKeyLength is the length of the generated default backup key. ArgoCDDefaultBackupKeyLength = 32 diff --git a/config/crd/bases/argoproj.io_applications.yaml b/config/crd/bases/argoproj.io_applications.yaml index 01d98b866..f85a22789 100644 --- a/config/crd/bases/argoproj.io_applications.yaml +++ b/config/crd/bases/argoproj.io_applications.yaml @@ -114,6 +114,11 @@ spec: sync: description: Sync contains parameters for the operation properties: + autoHealAttemptsCount: + description: SelfHealAttemptsCount contains the number of auto-heal + attempts + format: int64 + type: integer dryRun: description: DryRun specifies to perform a `kubectl apply --dry-run` without actually performing the sync @@ -2536,6 +2541,11 @@ spec: sync: description: Sync contains parameters for the operation properties: + autoHealAttemptsCount: + description: SelfHealAttemptsCount contains the number + of auto-heal attempts + format: int64 + type: integer dryRun: description: DryRun specifies to perform a `kubectl apply --dry-run` without actually performing the sync diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index c9059ce91..6578e51d4 100644 --- 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:405e7bde25affb7644c576a7f2d41ba30b88e2ef4f2f11945b920a33517895ce - name: controller +- name: controller newName: quay.io/argoprojlabs/argocd-operator + newTag: v0.12.0 diff --git a/deploy/olm-catalog/argocd-operator/0.12.0/argocd-operator.v0.12.0.clusterserviceversion.yaml b/deploy/olm-catalog/argocd-operator/0.12.0/argocd-operator.v0.12.0.clusterserviceversion.yaml index d458ea7db..48efb7d03 100644 --- a/deploy/olm-catalog/argocd-operator/0.12.0/argocd-operator.v0.12.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/argocd-operator/0.12.0/argocd-operator.v0.12.0.clusterserviceversion.yaml @@ -247,7 +247,7 @@ metadata: capabilities: Deep Insights categories: Integration & Delivery certified: "false" - createdAt: "2024-09-30T10:55:59Z" + createdAt: "2024-11-06T02:57:10Z" 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:405e7bde25affb7644c576a7f2d41ba30b88e2ef4f2f11945b920a33517895ce + image: quay.io/argoprojlabs/argocd-operator:v0.12.0 livenessProbe: httpGet: path: /healthz diff --git a/deploy/olm-catalog/argocd-operator/0.12.0/argoproj.io_applications.yaml b/deploy/olm-catalog/argocd-operator/0.12.0/argoproj.io_applications.yaml index fc06983e5..c09521cbf 100644 --- a/deploy/olm-catalog/argocd-operator/0.12.0/argoproj.io_applications.yaml +++ b/deploy/olm-catalog/argocd-operator/0.12.0/argoproj.io_applications.yaml @@ -115,6 +115,11 @@ spec: sync: description: Sync contains parameters for the operation properties: + autoHealAttemptsCount: + description: SelfHealAttemptsCount contains the number of auto-heal + attempts + format: int64 + type: integer dryRun: description: DryRun specifies to perform a `kubectl apply --dry-run` without actually performing the sync @@ -2537,6 +2542,11 @@ spec: sync: description: Sync contains parameters for the operation properties: + autoHealAttemptsCount: + description: SelfHealAttemptsCount contains the number + of auto-heal attempts + format: int64 + type: integer dryRun: description: DryRun specifies to perform a `kubectl apply --dry-run` without actually performing the sync diff --git a/go.mod b/go.mod index 66615eb48..b56e6c265 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21.0 toolchain go1.21.9 require ( - github.com/argoproj/argo-cd/v2 v2.12.6 + github.com/argoproj/argo-cd/v2 v2.12.7 github.com/cert-manager/cert-manager v1.14.4 github.com/coreos/prometheus-operator v0.40.0 github.com/go-logr/logr v1.4.2 diff --git a/go.sum b/go.sum index e7a446e94..79aae71ce 100644 --- a/go.sum +++ b/go.sum @@ -632,8 +632,8 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= -github.com/argoproj/argo-cd/v2 v2.12.6 h1:5EEdZbsyK1trxcm4AcCt5WNgGOAmXMdZSjEfe35IV7U= -github.com/argoproj/argo-cd/v2 v2.12.6/go.mod h1:BS64uTH/mG3dEpulAI4oIyJiluuYdAbGlisR/s9FrEM= +github.com/argoproj/argo-cd/v2 v2.12.7 h1:ug9spvZhpxyvgpj3r3IA3woLExVkAjOdA7NAqFlm4P8= +github.com/argoproj/argo-cd/v2 v2.12.7/go.mod h1:BS64uTH/mG3dEpulAI4oIyJiluuYdAbGlisR/s9FrEM= github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1 h1:qsHwwOJ21K2Ao0xPju1sNuqphyMnMYkyB3ZLoLtxWpo= github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1/go.mod h1:CZHlkyAD1/+FbEn6cB2DQTj48IoLGvEYsWEvtzP3238= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=