From 7fe4c9c76ce7b1f78b56d24bd46880c74c9e066c Mon Sep 17 00:00:00 2001 From: Ishita Sequeira Date: Wed, 6 Nov 2024 00:28:39 -0500 Subject: [PATCH 1/3] update argocd-operator version Signed-off-by: Ishita Sequeira --- go.mod | 4 ++-- go.sum | 8 ++++---- .../e2e/parallel/1-031_validate_toolchain/01-check.yaml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index bcbb54a39..f7011a407 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241019174305-df262fe66d25 - github.com/argoproj-labs/argocd-operator v0.12.1-0.20241022070936-f3c2fc4b2302 + github.com/argoproj-labs/argocd-operator v0.12.2 github.com/coreos/prometheus-operator v0.40.0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 @@ -27,7 +27,7 @@ require ( ) require ( - github.com/argoproj/argo-cd/v2 v2.12.6 // indirect + github.com/argoproj/argo-cd/v2 v2.12.7 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cert-manager/cert-manager v1.14.4 // indirect diff --git a/go.sum b/go.sum index e84a8753e..d01892ad0 100644 --- a/go.sum +++ b/go.sum @@ -622,10 +622,10 @@ github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241019174305-df262fe66d25 h1:Q3Xe/zfMlZ7AqW8FT2l4cGmKfsdhC99V3bulDhD7Pqo= github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241019174305-df262fe66d25/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM= -github.com/argoproj-labs/argocd-operator v0.12.1-0.20241022070936-f3c2fc4b2302 h1:XCJ081tKWf3lPrlhCKF3iD7p/2SODT2Ah34EkOeEAHs= -github.com/argoproj-labs/argocd-operator v0.12.1-0.20241022070936-f3c2fc4b2302/go.mod h1:Wc7grUq8ZFE7AVFXKBRGrSdADDetjafndCVaXxn68lY= -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-labs/argocd-operator v0.12.2 h1:fWCAECtkgdoAQBsOU13pOnRTLuD+Z9cbajvLEQN60x0= +github.com/argoproj-labs/argocd-operator v0.12.2/go.mod h1:0eQPIftjtMZ1ShLptYp+j4tUemF+CF5qrWBrQ1wNKgM= +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/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs= diff --git a/test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml b/test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml index a43e6e5ef..ebe317224 100644 --- a/test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml +++ b/test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml @@ -8,7 +8,7 @@ commands: # These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix expected_kustomizeVersion='v5.4.2' expected_helmVersion='v3.15.2' - expected_argocdVersion='v2.12.6+4dab5bd' + expected_argocdVersion='v2.12.7' if CI="prow"; then # when running against openshift-ci From 099a36875f0d5fad41eea63a8b36b7de01fd29a2 Mon Sep 17 00:00:00 2001 From: Ishita Sequeira Date: Thu, 7 Nov 2024 07:28:36 -0500 Subject: [PATCH 2/3] update CRDs Signed-off-by: Ishita Sequeira --- config/crd/bases/argoproj.io_applications.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 From 4419b95d75a4df05954f73f3234a8095a92aac89 Mon Sep 17 00:00:00 2001 From: Siddhesh Ghadi Date: Thu, 7 Nov 2024 19:06:23 +0530 Subject: [PATCH 3/3] make bundle Signed-off-by: Siddhesh Ghadi --- bundle/manifests/argoproj.io_applications.yaml | 10 ++++++++++ .../gitops-operator.clusterserviceversion.yaml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) 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/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index 098b7e31b..628307126 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -164,7 +164,7 @@ metadata: capabilities: Deep Insights console.openshift.io/plugins: '["gitops-plugin"]' containerImage: quay.io/redhat-developer/gitops-operator - createdAt: "2024-10-04T04:12:36Z" + createdAt: "2024-11-07T13:35:52Z" description: Enables teams to adopt GitOps principles for managing cluster configurations and application delivery across hybrid multi-cluster Kubernetes environments. features.operators.openshift.io/disconnected: "true"