Skip to content

Commit

Permalink
fix: upgrade to argocd 2.9.14 (#1327)
Browse files Browse the repository at this point in the history 
* fix: upgrade to argocd 2.9.14

Signed-off-by: saumeya <[email protected]>

* add to dockerfile and default

Signed-off-by: saumeya <[email protected]>

---------

Signed-off-by: saumeya <[email protected]>
  • Loading branch information
@saumeya
saumeya authored May 2, 2024
1 parent 7c970b9 commit 0b1de85
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build/util/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Argo CD v2.9.12
FROM quay.io/argoproj/argocd@sha256:7425bb4488f84c955be66d27860834f06bb3db06fce797a802ca28876df6d44f as argocd
# Argo CD v2.9.14
FROM quay.io/argoproj/argocd@sha256:9417eb2a76d9e55c67d09d8fb6b0708c72473e209556a5a2e83993594405fbb2 as argocd

# Final Image
FROM docker.io/library/ubuntu:22.04
Expand Down
2 changes: 1 addition & 1 deletion common/defaults.go
View file
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:7425bb4488f84c955be66d27860834f06bb3db06fce797a802ca28876df6d44f" // v2.9.12
ArgoCDDefaultArgoVersion = "sha256:9417eb2a76d9e55c67d09d8fb6b0708c72473e209556a5a2e83993594405fbb2" // v2.9.14

// ArgoCDDefaultBackupKeyLength is the length of the generated default backup key.
ArgoCDDefaultBackupKeyLength = 32
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/argoproj-labs/argocd-operator
go 1.20

require (
github.com/argoproj/argo-cd/v2 v2.9.12
github.com/argoproj/argo-cd/v2 v2.9.14
github.com/coreos/prometheus-operator v0.40.0
github.com/go-logr/logr v1.2.4
github.com/google/go-cmp v0.6.0
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -649,10 +649,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.9.11 h1:+PJqkfbR3f8+0H7ZJzQf9HV9DT8uVOZ3nepbxTtVPT0=
github.com/argoproj/argo-cd/v2 v2.9.11/go.mod h1:y24WY8Phm7hz9X7AlnkB5oq9swpoUiRlcT86wcTSRRI=
github.com/argoproj/argo-cd/v2 v2.9.12 h1:4g/b0U0/PF8Yqe2LsJ5OfMVpoJiEDPfrDdtXjkux010=
github.com/argoproj/argo-cd/v2 v2.9.12/go.mod h1:y24WY8Phm7hz9X7AlnkB5oq9swpoUiRlcT86wcTSRRI=
github.com/argoproj/argo-cd/v2 v2.9.14 h1:/GujbAJULSZxpbT2oE/bHi3qP3E7NkGUlM1t7G4t2Gc=
github.com/argoproj/argo-cd/v2 v2.9.14/go.mod h1:Cy70uz6NUrFYtF8tb7GzFYoF6JVpvLZe0KWRc/wmHvQ=
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=
Expand Down

0 comments on commit 0b1de85

Please sign in to comment.