chore: Upgrade argocd 2.11.12 release 0.11 (#1592)

* Upgrade argocd version to 2.11.12 Signed-off-by: Ishita Sequeira <[email protected]> * revert sdk version change Signed-off-by: Ishita Sequeira <[email protected]> * revert sdk version change Signed-off-by: Ishita Sequeira <[email protected]> --------- Signed-off-by: Ishita Sequeira <[email protected]>
argoproj-labs · Nov 6, 2024 · e05b6ac · e05b6ac
1 parent aeb96ba
commit e05b6ac
Show file tree

Hide file tree

Showing 13 changed files with 922 additions and 1,279 deletions.
diff --git a/build/util/Dockerfile b/build/util/Dockerfile
@@ -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

diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml
diff --git a/bundle/manifests/argoproj.io_applications.yaml b/bundle/manifests/argoproj.io_applications.yaml
diff --git a/bundle/manifests/argoproj.io_applicationsets.yaml b/bundle/manifests/argoproj.io_applicationsets.yaml
@@ -62,7 +62,6 @@ spec:
                                 type: string
                               type: object
                           type: object
-                          x-kubernetes-map-type: atomic
                         name:
                           type: string
                         requeueAfterSeconds:
@@ -659,7 +658,6 @@ spec:
                                 type: string
                               type: object
                           type: object
-                          x-kubernetes-map-type: atomic
                         template:
                           properties:
                             metadata:
@@ -2422,7 +2420,6 @@ spec:
                                           type: string
                                         type: object
                                     type: object
-                                    x-kubernetes-map-type: atomic
                                   name:
                                     type: string
                                   requeueAfterSeconds:
@@ -3019,7 +3016,6 @@ spec:
                                           type: string
                                         type: object
                                     type: object
-                                    x-kubernetes-map-type: atomic
                                   template:
                                     properties:
                                       metadata:
@@ -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:
@@ -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:
@@ -6915,7 +6881,6 @@ spec:
                                       type: string
                                     type: object
                                 type: object
-                                x-kubernetes-map-type: atomic
                             type: object
                           type: array
                         template:
@@ -7512,7 +7477,6 @@ spec:
                                           type: string
                                         type: object
                                     type: object
-                                    x-kubernetes-map-type: atomic
                                   name:
                                     type: string
                                   requeueAfterSeconds:
@@ -8109,7 +8073,6 @@ spec:
                                           type: string
                                         type: object
                                     type: object
-                                    x-kubernetes-map-type: atomic
                                   template:
                                     properties:
                                       metadata:
@@ -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:
@@ -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:
@@ -12005,7 +11938,6 @@ spec:
                                       type: string
                                     type: object
                                 type: object
-                                x-kubernetes-map-type: atomic
                             type: object
                           type: array
                         mergeKeys:
@@ -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:
@@ -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:
@@ -14736,7 +14638,6 @@ spec:
                             type: string
                           type: object
                       type: object
-                      x-kubernetes-map-type: atomic
                   type: object
                 type: array
               goTemplate:
@@ -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:
@@ -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

diff --git a/common/defaults.go b/common/defaults.go
@@ -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