From 785431453ad96d1475fc447a508a23ee320fb7f7 Mon Sep 17 00:00:00 2001 From: Saumeya Katyal Date: Wed, 28 Aug 2024 13:36:48 +0530 Subject: [PATCH] chore: update argocd to 2.12.3 (#772) * chore: update argocd to 2.12.3 Signed-off-by: saumeya * fix test Signed-off-by: saumeya --------- Signed-off-by: saumeya --- go.mod | 5 +++-- go.sum | 10 ++++++---- .../parallel/1-031_validate_toolchain/01-check.yaml | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index f348b602d..050083d22 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.4-0.20240807084148-a96aa79b5464 - github.com/argoproj-labs/argocd-operator v0.12.0-rc2 + github.com/argoproj-labs/argocd-operator v0.12.0-rc3 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,12 +27,13 @@ require ( ) require ( - github.com/argoproj/argo-cd/v2 v2.12.1 // indirect + github.com/argoproj/argo-cd/v2 v2.12.3 // 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 github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/dlclark/regexp2 v1.11.2 // indirect github.com/emicklei/go-restful/v3 v3.11.3 // indirect github.com/evanphx/json-patch v5.9.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.9.0 // indirect diff --git a/go.sum b/go.sum index 4436ec1a8..90c7d02b8 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.4-0.20240807084148-a96aa79b5464 h1:LTMoDmQoIjqhe+pulFiG7l80pnjjZX6WiivURO2uXsQ= github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM= -github.com/argoproj-labs/argocd-operator v0.12.0-rc2 h1:ilPGvQ58YIwV2/u/Lr/nxxvTEM7KKD/G8gyenEQ71mg= -github.com/argoproj-labs/argocd-operator v0.12.0-rc2/go.mod h1:0UkuFPHqvaA86xt90NED+hStmLkOsgbcKTxhkknGrbc= -github.com/argoproj/argo-cd/v2 v2.12.1 h1:UL7jCHZ1GuXdPnbr+RnpbAqtgbCgvZD11MwU6SFwFA8= -github.com/argoproj/argo-cd/v2 v2.12.1/go.mod h1:QbdGVT7f4aqrowJrMlJdoeKknLVcKKr5YDrzm1mVRmI= +github.com/argoproj-labs/argocd-operator v0.12.0-rc3 h1:UqHQFeaZKWY8IqsAgLU3CwjRymcYCsJ01Wysqf7nDiY= +github.com/argoproj-labs/argocd-operator v0.12.0-rc3/go.mod h1:+yvFAnSJZL8iOTWI3cTQ9qwXfh40lLyOI4ghDFqM8S0= +github.com/argoproj/argo-cd/v2 v2.12.3 h1:Bi4QahHTnKl3esU5MplQP1wraGhaTpvgAV4GsMqc3Zc= +github.com/argoproj/argo-cd/v2 v2.12.3/go.mod h1:2fh6q4NX/cylbH6Ktx/KjJsX7sOBwF3jbGnO0IZyNOc= 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= @@ -736,6 +736,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dgryski/go-sip13 v0.0.0-20190329191031-25c5027a8c7b/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dlclark/regexp2 v1.11.2 h1:/u628IuisSTwri5/UKloiIsH8+qF2Pu7xEQX+yIKg68= +github.com/dlclark/regexp2 v1.11.2/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= 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 ea6218b3c..5d7498324 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.1+26b2039' + expected_argocdVersion='v2.12.3+6b9cd82' if CI="prow"; then # when running against openshift-ci