Bumping the Version of the argo-cd helm chart to v2.2.0 (#1055)

Signed-off-by: Cedric Kienzler <github@cedric-kienzler.de>

charts/argo-cd/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v2.1.7
+appVersion: v2.2.0
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.28.1
+version: 3.29.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:

charts/argo-cd/crds/crd-extension.yaml

@@ -1,96 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  labels:
-    app.kubernetes.io/name: argocdextensions.argoproj.io
-    app.kubernetes.io/part-of: argocd
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
-  name: argocdextensions.argoproj.io
-spec:
-  group: argoproj.io
-  names:
-    kind: ArgoCDExtension
-    listKind: ArgoCDExtensionList
-    plural: argocdextensions
-    singular: argocdextension
-  scope: Namespaced
-  versions:
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        description: ArgoCDExtension is the Schema for the argocdextensions API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: ArgoCDExtensionSpec defines the desired state of ArgoCDExtension
-            properties:
-              sources:
-                description: Sources specifies where the extension should come from
-                items:
-                  description: ExtensionSource specifies where the extension should
-                    be sourced from
-                  properties:
-                    git:
-                      description: Git is specified if the extension should be sourced
-                        from a git repository
-                      properties:
-                        revision:
-                          description: Revision specifies the revision of the Repository
-                            to fetch
-                          type: string
-                        url:
-                          description: URL specifies the Git repository URL to fetch
-                          type: string
-                      type: object
-                    web:
-                      description: Web is specified if the extension should be sourced
-                        from a web file
-                      properties:
-                        url:
-                          description: URK specifies the remote file URL
-                          type: string
-                      type: object
-                  type: object
-                type: array
-            required:
-            - sources
-            type: object
-          status:
-            description: ArgoCDExtensionStatus defines the observed state of ArgoCDExtension
-            properties:
-              conditions:
-                items:
-                  properties:
-                    message:
-                      description: Message contains human-readable message indicating
-                        details about condition
-                      type: string
-                    status:
-                      description: Boolean status describing if the condition is currently
-                        true
-                      type: string
-                    type:
-                      description: Type is an ArgoCDExtension condition type
-                      type: string
-                  required:
-                  - message
-                  - status
-                  - type
-                  type: object
-                type: array
-            type: object
-        type: object
-    served: true
-    storage: true

charts/argo-cd/crds/crd-project.yaml

@@ -20,13 +20,22 @@ spec:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: 'AppProject provides a logical grouping of applications, providing controls for: * where the apps may deploy to (cluster whitelist) * what may be deployed (repository whitelist, resource whitelist/blacklist) * who can access these applications (roles, OIDC group claims bindings) * and what they can do (RBAC policies) * automation access to these roles (JWT tokens)'
+        description: 'AppProject provides a logical grouping of applications, providing
+          controls for: * where the apps may deploy to (cluster whitelist) * what
+          may be deployed (repository whitelist, resource whitelist/blacklist) * who
+          can access these applications (roles, OIDC group claims bindings) * and
+          what they can do (RBAC policies) * automation access to these roles (JWT
+          tokens)'
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object
@@ -34,9 +43,12 @@ spec:
             description: AppProjectSpec is the specification of an AppProject
             properties:
               clusterResourceBlacklist:
-                description: ClusterResourceBlacklist contains list of blacklisted cluster level resources
+                description: ClusterResourceBlacklist contains list of blacklisted
+                  cluster level resources
                 items:
-                  description: GroupKind specifies a Group and a Kind, but does not force a version.  This is useful for identifying concepts during lookup stages without having partially valid types
+                  description: GroupKind specifies a Group and a Kind, but does not
+                    force a version.  This is useful for identifying concepts during
+                    lookup stages without having partially valid types
                   properties:
                     group:
                       type: string
@@ -48,9 +60,12 @@ spec:
                   type: object
                 type: array
               clusterResourceWhitelist:
-                description: ClusterResourceWhitelist contains list of whitelisted cluster level resources
+                description: ClusterResourceWhitelist contains list of whitelisted
+                  cluster level resources
                 items:
-                  description: GroupKind specifies a Group and a Kind, but does not force a version.  This is useful for identifying concepts during lookup stages without having partially valid types
+                  description: GroupKind specifies a Group and a Kind, but does not
+                    force a version.  This is useful for identifying concepts during
+                    lookup stages without having partially valid types
                   properties:
                     group:
                       type: string
@@ -65,25 +80,34 @@ spec:
                 description: Description contains optional project description
                 type: string
               destinations:
-                description: Destinations contains list of destinations available for deployment
+                description: Destinations contains list of destinations available
+                  for deployment
                 items:
-                  description: ApplicationDestination holds information about the application's destination
+                  description: ApplicationDestination holds information about the
+                    application's destination
                   properties:
                     name:
-                      description: Name is an alternate way of specifying the target cluster by its symbolic name
+                      description: Name is an alternate way of specifying the target
+                        cluster by its symbolic name
                       type: string
                     namespace:
-                      description: Namespace specifies the target namespace for the application's resources. The namespace will only be set for namespace-scoped resources that have not set a value for .metadata.namespace
+                      description: Namespace specifies the target namespace for the
+                        application's resources. The namespace will only be set for
+                        namespace-scoped resources that have not set a value for .metadata.namespace
                       type: string
                     server:
-                      description: Server specifies the URL of the target cluster and must be set to the Kubernetes control plane API
+                      description: Server specifies the URL of the target cluster
+                        and must be set to the Kubernetes control plane API
                       type: string
                   type: object
                 type: array
               namespaceResourceBlacklist:
-                description: NamespaceResourceBlacklist contains list of blacklisted namespace level resources
+                description: NamespaceResourceBlacklist contains list of blacklisted
+                  namespace level resources
                 items:
-                  description: GroupKind specifies a Group and a Kind, but does not force a version.  This is useful for identifying concepts during lookup stages without having partially valid types
+                  description: GroupKind specifies a Group and a Kind, but does not
+                    force a version.  This is useful for identifying concepts during
+                    lookup stages without having partially valid types
                   properties:
                     group:
                       type: string
@@ -95,9 +119,12 @@ spec:
                   type: object
                 type: array
               namespaceResourceWhitelist:
-                description: NamespaceResourceWhitelist contains list of whitelisted namespace level resources
+                description: NamespaceResourceWhitelist contains list of whitelisted
+                  namespace level resources
                 items:
-                  description: GroupKind specifies a Group and a Kind, but does not force a version.  This is useful for identifying concepts during lookup stages without having partially valid types
+                  description: GroupKind specifies a Group and a Kind, but does not
+                    force a version.  This is useful for identifying concepts during
+                    lookup stages without having partially valid types
                   properties:
                     group:
                       type: string
@@ -109,12 +136,15 @@ spec:
                   type: object
                 type: array
               orphanedResources:
-                description: OrphanedResources specifies if controller should monitor orphaned resources of apps in this project
+                description: OrphanedResources specifies if controller should monitor
+                  orphaned resources of apps in this project
                 properties:
                   ignore:
-                    description: Ignore contains a list of resources that are to be excluded from orphaned resources monitoring
+                    description: Ignore contains a list of resources that are to be
+                      excluded from orphaned resources monitoring
                     items:
-                      description: OrphanedResourceKey is a reference to a resource to be ignored from
+                      description: OrphanedResourceKey is a reference to a resource
+                        to be ignored from
                       properties:
                         group:
                           type: string
@@ -125,26 +155,32 @@ spec:
                       type: object
                     type: array
                   warn:
-                    description: Warn indicates if warning condition should be created for apps which have orphaned resources
+                    description: Warn indicates if warning condition should be created
+                      for apps which have orphaned resources
                     type: boolean
                 type: object
               roles:
-                description: Roles are user defined RBAC roles associated with this project
+                description: Roles are user defined RBAC roles associated with this
+                  project
                 items:
-                  description: ProjectRole represents a role that has access to a project
+                  description: ProjectRole represents a role that has access to a
+                    project
                   properties:
                     description:
                       description: Description is a description of the role
                       type: string
                     groups:
-                      description: Groups are a list of OIDC group claims bound to this role
+                      description: Groups are a list of OIDC group claims bound to
+                        this role
                       items:
                         type: string
                       type: array
                     jwtTokens:
-                      description: JWTTokens are a list of generated JWT tokens bound to this role
+                      description: JWTTokens are a list of generated JWT tokens bound
+                        to this role
                       items:
-                        description: JWTToken holds the issuedAt and expiresAt values of a token
+                        description: JWTToken holds the issuedAt and expiresAt values
+                          of a token
                         properties:
                           exp:
                             format: int64
@@ -162,7 +198,8 @@ spec:
                       description: Name is a name for this role
                       type: string
                     policies:
-                      description: Policies Stores a list of casbin formated strings that define access policies for the role in the project
+                      description: Policies Stores a list of casbin formatted strings
+                        that define access policies for the role in the project
                       items:
                         type: string
                       type: array
@@ -171,9 +208,11 @@ spec:
                   type: object
                 type: array
               signatureKeys:
-                description: SignatureKeys contains a list of PGP key IDs that commits in Git must be signed with in order to be allowed for sync
+                description: SignatureKeys contains a list of PGP key IDs that commits
+                  in Git must be signed with in order to be allowed for sync
                 items:
-                  description: SignatureKey is the specification of a key required to verify commit signatures with
+                  description: SignatureKey is the specification of a key required
+                    to verify commit signatures with
                   properties:
                     keyID:
                       description: The ID of the key in hexadecimal notation
@@ -183,47 +222,61 @@ spec:
                   type: object
                 type: array
               sourceRepos:
-                description: SourceRepos contains list of repository URLs which can be used for deployment
+                description: SourceRepos contains list of repository URLs which can
+                  be used for deployment
                 items:
                   type: string
                 type: array
               syncWindows:
-                description: SyncWindows controls when syncs can be run for apps in this project
+                description: SyncWindows controls when syncs can be run for apps in
+                  this project
                 items:
-                  description: SyncWindow contains the kind, time, duration and attributes that are used to assign the syncWindows to apps
+                  description: SyncWindow contains the kind, time, duration and attributes
+                    that are used to assign the syncWindows to apps
                   properties:
                     applications:
-                      description: Applications contains a list of applications that the window will apply to
+                      description: Applications contains a list of applications that
+                        the window will apply to
                       items:
                         type: string
                       type: array
                     clusters:
-                      description: Clusters contains a list of clusters that the window will apply to
+                      description: Clusters contains a list of clusters that the window
+                        will apply to
                       items:
                         type: string
                       type: array
                     duration:
-                      description: Duration is the amount of time the sync window will be open
+                      description: Duration is the amount of time the sync window
+                        will be open
                       type: string
                     kind:
                       description: Kind defines if the window allows or blocks syncs
                       type: string
                     manualSync:
-                      description: ManualSync enables manual syncs when they would otherwise be blocked
+                      description: ManualSync enables manual syncs when they would
+                        otherwise be blocked
                       type: boolean
                     namespaces:
-                      description: Namespaces contains a list of namespaces that the window will apply to
+                      description: Namespaces contains a list of namespaces that the
+                        window will apply to
                       items:
                         type: string
                       type: array
                     schedule:
-                      description: Schedule is the time the window will begin, specified in cron format
+                      description: Schedule is the time the window will begin, specified
+                        in cron format
+                      type: string
+                    timeZone:
+                      description: TimeZone of the sync that will be applied to the
+                        schedule
                       type: string
                   type: object
                 type: array
             type: object
           status:
-            description: AppProjectStatus contains status information for AppProject CRs
+            description: AppProjectStatus contains status information for AppProject
+              CRs
             properties:
               jwtTokensByRole:
                 additionalProperties:
@@ -231,7 +284,8 @@ spec:
                   properties:
                     items:
                       items:
-                        description: JWTToken holds the issuedAt and expiresAt values of a token
+                        description: JWTToken holds the issuedAt and expiresAt values
+                          of a token
                         properties:
                           exp:
                             format: int64
@@ -246,7 +300,8 @@ spec:
                         type: object
                       type: array
                   type: object
-                description: JWTTokensByRole contains a list of JWT tokens issued for a given role
+                description: JWTTokensByRole contains a list of JWT tokens issued
+                  for a given role
                 type: object
             type: object
         required:

charts/argo-cd/templates/argocd-repo-server/deployment.yaml

@@ -34,6 +34,17 @@ spec:
       {{- if .Values.global.securityContext }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       {{- end }}
+      initContainers:
+      - command:
+        - cp
+        - -n
+        - /usr/local/bin/argocd
+        - /var/run/argocd/argocd-cmp-server
+        image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }}
+        name: copyutil
+        volumeMounts:
+        - mountPath: /var/run/argocd
+          name: var-files
       containers:
       - name: {{ .Values.repoServer.name }}
         image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }}
@@ -87,6 +98,8 @@ spec:
           name: argocd-repo-server-tls
         - mountPath: /tmp
           name: tmp-dir
+        - mountPath: /home/argocd/cmp-server/plugins
+          name: plugins
         ports:
         - name: repo-server
           containerPort: {{ .Values.repoServer.containerPort }}
@@ -177,6 +190,10 @@ spec:
           secretName: argocd-repo-server-tls
       - emptyDir: {}
         name: tmp-dir
+      - emptyDir: {}
+        name: var-files
+      - emptyDir: {}
+        name: plugins
       {{- if .Values.repoServer.initContainers }}
       initContainers:
       {{- toYaml .Values.repoServer.initContainers | nindent 6 }}

charts/argo-cd/templates/argocd-server/deployment.yaml

@@ -98,6 +98,8 @@ spec:
         - mountPath: /home/argocd/.aws
           name: aws-config
         {{- end }}
+        - mountPath: /home/argocd
+          name: plugins-home
         - mountPath: /tmp
           name: tmp-dir
         ports:
@@ -216,6 +218,8 @@ spec:
             path: ca.crt
           optional: true
           secretName: argocd-repo-server-tls
+      - emptyDir: {}
+        name: plugins-home
       {{- if .Values.server.initContainers }}
       initContainers:
       {{- toYaml .Values.server.initContainers | nindent 6 }}