Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Upgrade argocd 2.11.12 release 0.11 #1592

Merged
merged 3 commits into from
Nov 6, 2024
Merged

chore: Upgrade argocd 2.11.12 release 0.11 #1592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5c4688
Upgrade argocd version to 2.11.12
ishitasequeira Nov 6, 2024
74ca66c
revert sdk version change
ishitasequeira Nov 6, 2024
f6837bf
revert sdk version change
ishitasequeira Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/util/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Argo CD v2.11.11
FROM quay.io/argoproj/argocd@sha256:f07b58355e244e9dfa0b4aa70475e3d06f4770ccc891a8c9365250a10198a655 as argocd
# Argo CD v2.11.12
FROM quay.io/argoproj/argocd@sha256:94daa7d4714c754054fac7fe72bef511aa348abffe99a0269dd7db704eff7fe7 as argocd

# Final Image
FROM docker.io/library/ubuntu:24.04
Expand Down
319 changes: 157 additions & 162 deletions bundle/manifests/argocd-operator.clusterserviceversion.yaml
View file
Open in desktop

Large diffs are not rendered by default.

277 changes: 149 additions & 128 deletions bundle/manifests/argoproj.io_applications.yaml
View file
Open in desktop

Large diffs are not rendered by default.

135 changes: 0 additions & 135 deletions bundle/manifests/argoproj.io_applicationsets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
name:
type: string
requeueAfterSeconds:
Expand Down Expand Up @@ -659,7 +658,6 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
template:
properties:
metadata:
Expand Down Expand Up @@ -2422,7 +2420,6 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
name:
type: string
requeueAfterSeconds:
Expand Down Expand Up @@ -3019,7 +3016,6 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
template:
properties:
metadata:
Expand Down Expand Up @@ -5437,21 +5433,6 @@ spec:
- passwordRef
- username
type: object
bearerToken:
properties:
tokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
required:
- tokenRef
type: object
project:
type: string
repo:
Expand Down Expand Up @@ -6207,21 +6188,6 @@ spec:
- passwordRef
- username
type: object
bearerToken:
properties:
tokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
required:
- tokenRef
type: object
project:
type: string
required:
Expand Down Expand Up @@ -6915,7 +6881,6 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
type: object
type: array
template:
Expand Down Expand Up @@ -7512,7 +7477,6 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
name:
type: string
requeueAfterSeconds:
Expand Down Expand Up @@ -8109,7 +8073,6 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
template:
properties:
metadata:
Expand Down Expand Up @@ -10527,21 +10490,6 @@ spec:
- passwordRef
- username
type: object
bearerToken:
properties:
tokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
required:
- tokenRef
type: object
project:
type: string
repo:
Expand Down Expand Up @@ -11297,21 +11245,6 @@ spec:
- passwordRef
- username
type: object
bearerToken:
properties:
tokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
required:
- tokenRef
type: object
project:
type: string
required:
Expand Down Expand Up @@ -12005,7 +11938,6 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
type: object
type: array
mergeKeys:
Expand Down Expand Up @@ -13258,21 +13190,6 @@ spec:
- passwordRef
- username
type: object
bearerToken:
properties:
tokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
required:
- tokenRef
type: object
project:
type: string
repo:
Expand Down Expand Up @@ -14028,21 +13945,6 @@ spec:
- passwordRef
- username
type: object
bearerToken:
properties:
tokenRef:
properties:
key:
type: string
secretName:
type: string
required:
- key
- secretName
type: object
required:
- tokenRef
type: object
project:
type: string
required:
Expand Down Expand Up @@ -14736,7 +14638,6 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
type: object
type: array
goTemplate:
Expand Down Expand Up @@ -15395,16 +15296,11 @@ spec:
type: string
step:
type: string
targetRevisions:
items:
type: string
type: array
required:
- application
- message
- status
- step
- targetRevisions
type: object
type: array
conditions:
Expand All @@ -15428,37 +15324,6 @@ spec:
- type
type: object
type: array
resources:
items:
properties:
group:
type: string
health:
properties:
message:
type: string
status:
type: string
type: object
hook:
type: boolean
kind:
type: string
name:
type: string
namespace:
type: string
requiresPruning:
type: boolean
status:
type: string
syncWave:
format: int64
type: integer
version:
type: string
type: object
type: array
type: object
required:
- metadata
Expand Down
2 changes: 1 addition & 1 deletion common/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const (
ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd"

// ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified.
ArgoCDDefaultArgoVersion = "sha256:f07b58355e244e9dfa0b4aa70475e3d06f4770ccc891a8c9365250a10198a655" // v2.11.11
ArgoCDDefaultArgoVersion = "sha256:94daa7d4714c754054fac7fe72bef511aa348abffe99a0269dd7db704eff7fe7" // v2.11.12

// ArgoCDDefaultBackupKeyLength is the length of the generated default backup key.
ArgoCDDefaultBackupKeyLength = 32
Expand Down
Loading
Loading