From a8b4eb1cfca8e1b6292a1e8958d14e2a4c9f5a04 Mon Sep 17 00:00:00 2001 From: Saumeya Katyal Date: Tue, 27 Aug 2024 23:25:30 +0530 Subject: [PATCH] chore: upgrade argocd to 1.12.3 (#1524) * chore: upgrade argocd to 1.12.3 Signed-off-by: saumeya * fix Signed-off-by: saumeya --------- Signed-off-by: saumeya --- build/util/Dockerfile | 4 ++-- common/defaults.go | 2 +- controllers/argocd/custommapper.go | 2 +- controllers/argocd/util.go | 2 +- go.mod | 3 ++- go.sum | 6 ++++-- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build/util/Dockerfile b/build/util/Dockerfile index 6504de59d..414fc07fc 100644 --- a/build/util/Dockerfile +++ b/build/util/Dockerfile @@ -1,5 +1,5 @@ -# Argo CD v2.12.1 -FROM quay.io/argoproj/argocd@sha256:a0ebfa7d419a1c78babc80fc77de093751d8a5fabffcaf3f7e81a4d55a23cc0d as argocd +# Argo CD v2.12.3 +FROM quay.io/argoproj/argocd@sha256:68894064bc381c19ea951029510aa614bd26bf46c2ec65ea445c7d8d095a9417 as argocd # Final Image FROM docker.io/library/ubuntu:24.04 diff --git a/common/defaults.go b/common/defaults.go index 2ba61dc7b..862a18809 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:a0ebfa7d419a1c78babc80fc77de093751d8a5fabffcaf3f7e81a4d55a23cc0d" // v2.12.1 + ArgoCDDefaultArgoVersion = "sha256:68894064bc381c19ea951029510aa614bd26bf46c2ec65ea445c7d8d095a9417" // v2.12.3 // ArgoCDDefaultBackupKeyLength is the length of the generated default backup key. ArgoCDDefaultBackupKeyLength = 32 diff --git a/controllers/argocd/custommapper.go b/controllers/argocd/custommapper.go index e212c8f58..e3bcc75cd 100644 --- a/controllers/argocd/custommapper.go +++ b/controllers/argocd/custommapper.go @@ -159,7 +159,7 @@ func (r *ReconcileArgoCD) namespaceResourceMapper(ctx context.Context, o client. return result } for _, argocd := range argocds.Items { - if glob.MatchStringInList(argocd.Spec.SourceNamespaces, namespaceName, false) { + if glob.MatchStringInList(argocd.Spec.SourceNamespaces, namespaceName, glob.GLOB) { namespacedName := client.ObjectKey{ Name: argocd.Name, Namespace: argocd.Namespace, diff --git a/controllers/argocd/util.go b/controllers/argocd/util.go index 04f56f58f..b5f680fa8 100644 --- a/controllers/argocd/util.go +++ b/controllers/argocd/util.go @@ -1427,7 +1427,7 @@ func (r *ReconcileArgoCD) getSourceNamespaces(cr *argoproj.ArgoCD) ([]string, er } for _, namespace := range namespaces.Items { - if glob.MatchStringInList(cr.Spec.SourceNamespaces, namespace.Name, false) { + if glob.MatchStringInList(cr.Spec.SourceNamespaces, namespace.Name, glob.GLOB) { sourceNamespaces = append(sourceNamespaces, namespace.Name) } } diff --git a/go.mod b/go.mod index e730eb7a7..67d753fc5 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.1 + github.com/argoproj/argo-cd/v2 v2.12.3 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 @@ -34,6 +34,7 @@ require ( github.com/beorn7/perks v1.0.1 // 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.0 // indirect github.com/evanphx/json-patch v5.9.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.8.0 // indirect diff --git a/go.sum b/go.sum index d69a9b480..012e93560 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.1 h1:UL7jCHZ1GuXdPnbr+RnpbAqtgbCgvZD11MwU6SFwFA8= -github.com/argoproj/argo-cd/v2 v2.12.1/go.mod h1:QbdGVT7f4aqrowJrMlJdoeKknLVcKKr5YDrzm1mVRmI= +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/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= @@ -743,6 +743,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=