Merge branch 'master' into feat-argo-events-service-account-annotations

CODEOWNERS

@@ -4,7 +4,7 @@
 /charts/argo @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler
 
 # Argo CD
-/charts/argo-cd @seanson @spencergilbert @davidkarlsen @mr-sour @yann-soubeyrand @oliverbaehler
+/charts/argo-cd @seanson @davidkarlsen @mr-sour @yann-soubeyrand @oliverbaehler
 
 # Argo Events
 /charts/argo-events @jbehling @VaibhavPage @oliverbaehler

charts/argo-cd/Chart.lock

@@ -3,4 +3,4 @@ dependencies:
   repository: https://dandydeveloper.github.io/charts/
   version: 4.10.4
 digest: sha256:e36321520ffd6f91962b0bcfeae947a86983d6b6d273eb616f08425e2b8ab9c2
-generated: "2021-03-03T10:13:21.0955491+01:00"
+generated: "2021-04-14T13:41:16.151666-07:00"

charts/argo-cd/Chart.yaml

@@ -1,8 +1,8 @@
-apiVersion: v1
+apiVersion: v2
-appVersion: 1.8.4
+appVersion: 2.0.0
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.17.5
+version: 3.2.2
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
@@ -14,3 +14,8 @@ maintainers:
   - name: alexmt
   - name: jessesuen
   - name: seanson
+dependencies:
+  - name: redis-ha
+    version: 4.10.4
+    repository: https://dandydeveloper.github.io/charts/
+    condition: redis-ha.enabled

charts/argo-cd/README.md

@@ -12,8 +12,32 @@ The default installation is intended to be similar to the provided ArgoCD [relea
 
 This chart currently installs the non-HA version of ArgoCD.
 
+### Synchronizing Changes from Original Repository
+
+In the original [ArgoCD repository](https://github.com/argoproj/argo-cd/) an [`manifests/install.yaml`](https://github.com/argoproj/argo-cd/blob/master/manifests/install.yaml) is generated using `kustomize`. It's the basis for the installation as [described in the docs](https://argo-cd.readthedocs.io/en/stable/getting_started/#1-install-argo-cd).
+
+When installing ArgoCD using this helm chart the user should have a similar experience and configuration rolled out. Hence, it makes sense to try to achieve a similar output of rendered `.yaml` resources when calling `helm template` using the default settings in `values.yaml`.
+
+To update the templates and default settings in `values.yaml` it may come in handy to look up the diff of the `manifests/install.yaml` between two versions accordingly. This can either be done directly via github and look for `manifests/install.yaml`:
+
+https://github.com/argoproj/argo-cd/compare/v1.8.7...v2.0.0#files_bucket
+
+Or you clone the repository and do a local `git-diff`:
+
+```bash
+git clone https://github.com/argoproj/argo-cd.git
+cd argo-cd
+git diff v1.8.7 v2.0.0 -- manifests/install.yaml
+```
+
+Changes in the `CustomResourceDefinition` resources shall be fixed easily by copying 1:1 from the [`manifests/crds` folder](https://github.com/argoproj/argo-cd/tree/master/manifests/crds) into this [`charts/argo-cd/crds` folder](https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd/crds).
+
 ## Upgrading
 
+### 3.0.0 and above
+
+Helm apiVersion switched to `v2`. Requires Helm `3.0.0` or above to install. [Read More](https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/) on how to migrate your release from Helm 2 to Helm 3.
+
 ### 2.14.7 and above
 
 The `matchLabels` key in the ArgoCD Appliaction Controller is no longer hard-coded. Note that labels are immutable so caution should be exercised when making changes to this resource.
@@ -76,6 +100,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` |
 | nameOverride | Provide a name in place of `argocd` | `"argocd"` |
 | installCRDs | Install CRDs if you are using Helm2. | `true` |
+| configs.clusterCredentials | Provide one or multiple [external cluster credentials](https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#clusters) | `[]` (See [values.yaml](values.yaml)) |
 | configs.knownHostsAnnotations | Known Hosts configmap annotations | `{}` |
 | configs.knownHosts.data.ssh_known_hosts | Known Hosts | See [values.yaml](values.yaml) |
 | configs.secret.annotations | Annotations for argocd-secret | `{}` |
@@ -222,12 +247,14 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | server.ingress.enabled | Enable an ingress resource for the server | `false` |
 | server.ingress.hosts | List of ingress hosts | `[]` |
 | server.ingress.labels | Additional ingress labels. | `{}` |
+| server.ingress.ingressClassName | Defines which ingress controller will implement the resource | `""` |
 | server.ingress.tls | Ingress TLS configuration. | `[]` |
 | server.ingress.https | Uses `server.service.servicePortHttps` instead `server.service.servicePortHttp` | `false` |
 | server.ingressGrpc.annotations | Additional ingress annotations for dedicated [gRPC-ingress] | `{}` |
 | server.ingressGrpc.enabled | Enable an ingress resource for the server for dedicated [gRPC-ingress] | `false` |
 | server.ingressGrpc.hosts | List of ingress hosts for dedicated [gRPC-ingress] | `[]` |
 | server.ingressGrpc.labels | Additional ingress labels for dedicated [gRPC-ingress] | `{}` |
+| server.ingressGrpc.ingressClassName | Defines which ingress controller will implement the resource [gRPC-ingress] | `""` |
 | server.ingressGrpc.tls | Ingress TLS configuration for dedicated [gRPC-ingress] | `[]` |
 | server.route.enabled | Enable a OpenShift route for the server | `false` |
 | server.route.hostname | Hostname of OpenShift route | `""` |
@@ -327,7 +354,8 @@ through `xxx.extraArgs`
 | redis.enabled | Enable redis | `true` |
 | redis.image.imagePullPolicy | Redis imagePullPolicy | `"IfNotPresent"` |
 | redis.image.repository | Redis repository | `"redis"` |
-| redis.image.tag | Redis tag | `"5.0.8"` |
+| redis.image.tag | Redis tag | `"6.2.1-alpine"` |
+| redis.extraArgs | Additional arguments for the `redis-server`. A list of flags. | `[]` |
 | redis.name | Redis name | `"redis"` |
 | redis.env | Environment variables for the Redis server. | `[]` |
 | redis.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` |
@@ -347,6 +375,6 @@ through `xxx.extraArgs`
 | redis-ha.redis.config.save | Will save the DB if both the given number of seconds and the given number of write operations against the DB occurred. `""`  is disabled | `""` |
 | redis-ha.haproxy.enabled | Enabled HAProxy LoadBalancing/Proxy | `true` |
 | redis-ha.haproxy.metrics.enabled | HAProxy enable prometheus metric scraping | `true` |
-| redis-ha.image.tag | Redis tag | `"5.0.8-alpine"` |
+| redis-ha.image.tag | Redis tag | `"6.2.1-alpine"` |
 
 [gRPC-ingress]: https://argoproj.github.io/argo-cd/operator-manual/ingress/

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

@@ -20,8 +20,6 @@ spec:
   scope: Namespaced
   versions:
   - name: v1alpha1
-    served: true
-    storage: true
     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)'
@@ -71,16 +69,16 @@ spec:
               destinations:
                 description: Destinations contains list of destinations available for deployment
                 items:
-                  description: ApplicationDestination contains deployment destination information
+                  description: ApplicationDestination holds information about the application's destination
                   properties:
                     name:
-                      description: Name of the destination cluster which can be used instead of server (url) field
+                      description: Name is an alternate way of specifying the target cluster by its symbolic name
                       type: string
                     namespace:
-                      description: Namespace overrides the environment namespace value in the ksonnet app.yaml
+                      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 overrides the environment server value in the ksonnet app.yaml
+                      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
@@ -116,7 +114,9 @@ spec:
                 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
                     items:
+                      description: OrphanedResourceKey is a reference to a resource to be ignored from
                       properties:
                         group:
                           type: string
@@ -173,7 +173,7 @@ spec:
                   type: object
                 type: array
               signatureKeys:
-                description: List of PGP key IDs that commits to be synced to must be signed with
+                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
                   properties:
@@ -225,34 +225,35 @@ spec:
                 type: array
             type: object
           status:
-            description: Status of the AppProject
+            description: AppProjectStatus contains status information for AppProject CRs
             properties:
               jwtTokensByRole:
-                description: JWT Tokens issued for each of the roles in the project
                 additionalProperties:
+                  description: JWTTokens represents a list of JWT tokens
                   properties:
                     items:
-                      description: List of JWT Tokens issued for the role
                       items:
-                        description: Holds the issuedAt and expiresAt values of the token
+                        description: JWTToken holds the issuedAt and expiresAt values of a token
                         properties:
                           exp:
-                            description: The expiresAt value of a token
                             format: int64
                             type: integer
                           iat:
-                            description: The issuedAt value of a token
                             format: int64
                             type: integer
                           id:
-                            description: ID of the token
                             type: string
+                        required:
+                        - iat
                         type: object
                       type: array
                   type: object
+                description: JWTTokensByRole contains a list of JWT tokens issued for a given role
                 type: object
             type: object
         required:
         - metadata
         - spec
         type: object
+    served: true
+    storage: true

charts/argo-cd/requirements.yaml

@@ -1,5 +0,0 @@
-dependencies:
-- name: redis-ha
-  version: 4.10.4
-  repository: https://dandydeveloper.github.io/charts/
-  condition: redis-ha.enabled

charts/argo-cd/templates/_helpers.tpl

@@ -139,3 +139,16 @@ app.kubernetes.io/instance: {{ .context.Release.Name }}
 app.kubernetes.io/component: {{ .component }}
 {{- end }}
 {{- end }}
+
+{{/*
+Return the appropriate apiVersion for ingress
+*/}}
+{{- define "argo-cd.ingress.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- end -}}
+{{- end -}}

charts/argo-cd/templates/argocd-application-controller/deployment.yaml

@@ -92,8 +92,10 @@ spec:
           timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }}
           successThreshold: {{ .Values.controller.readinessProbe.successThreshold }}
           failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }}
-{{- if .Values.controller.volumeMounts }}
         volumeMounts:
+        - mountPath: /app/config/controller/tls
+          name: argocd-repo-server-tls
+{{- if .Values.controller.volumeMounts }}
 {{- toYaml .Values.controller.volumeMounts | nindent 10}}
 {{- end }}
         resources:
@@ -115,8 +117,19 @@ spec:
       hostAliases:
 {{ toYaml . | indent 6 }}
 {{- end }}
-{{- if .Values.controller.volumes }}
       volumes:
+      - name: argocd-repo-server-tls
+        secret:
+          items:
+          - key: tls.crt
+            path: tls.crt
+          - key: tls.key
+            path: tls.key
+          - key: ca.crt
+            path: ca.crt
+          optional: true
+          secretName: argocd-repo-server-tls
+{{- if .Values.controller.volumes }}
 {{- toYaml .Values.controller.volumes | nindent 8 }}
 {{- end }}
 {{- if .Values.controller.priorityClassName }}

charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml

@@ -0,0 +1,26 @@
+{{- range .Values.configs.clusterCredentials }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "argo-cd.name" $ }}-cluster-{{ .name }}
+  labels:
+    {{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}
+    {{- with .labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+    argocd.argoproj.io/secret-type: cluster
+  {{- with .annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+type: Opaque
+stringData:
+  name: {{ required "A valid .Values.configs.clusterCredentials[].name entry is required!" .name }}
+  server: {{ required "A valid .Values.configs.clusterCredentials[].server entry is required!" .server }}
+  {{- with .namespaces }}
+  namespaces: {{ . }}
+  {{- end }}
+  config: |
+    {{- required "A valid .Values.configs.clusterCredentials[].config entry is required!" .config | toPrettyJson | nindent 4 }}
+{{- end }}

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

@@ -81,6 +81,8 @@ spec:
         - mountPath: /app/config/tls
           name: tls-certs
         {{- end }}
+        - mountPath: /app/config/reposerver/tls
+          name: argocd-repo-server-tls
         - mountPath: /tmp
           name: tmp-dir
         ports:
@@ -143,6 +145,17 @@ spec:
           name: argocd-tls-certs-cm
         name: tls-certs
       {{- end }}
+      - name: argocd-repo-server-tls
+        secret:
+          items:
+          - key: tls.crt
+            path: tls.crt
+          - key: tls.key
+            path: tls.key
+          - key: ca.crt
+            path: ca.crt
+          optional: true
+          secretName: argocd-repo-server-tls
       - emptyDir: {}
         name: tmp-dir
       {{- if .Values.repoServer.initContainers }}

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

@@ -80,6 +80,8 @@ spec:
         - mountPath: /app/config/tls
           name: tls-certs
         {{- end }}
+        - mountPath: /app/config/server/tls
+          name: argocd-repo-server-tls
         ports:
         - name: {{ .Values.server.name }}
           containerPort: {{ .Values.server.containerPort }}
@@ -149,6 +151,17 @@ spec:
           name: argocd-tls-certs-cm
         name: tls-certs
       {{- end }}
+      - name: argocd-repo-server-tls
+        secret:
+          items:
+          - key: tls.crt
+            path: tls.crt
+          - key: tls.key
+            path: tls.key
+          - key: ca.crt
+            path: ca.crt
+          optional: true
+          secretName: argocd-repo-server-tls
 {{- if .Values.server.priorityClassName }}
       priorityClassName: {{ .Values.server.priorityClassName }}
 {{- end }}

charts/argo-cd/templates/argocd-server/ingress-grpc.yaml

@@ -3,11 +3,7 @@
 {{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingressGrpc.https -}}
 {{- $paths := .Values.server.ingressGrpc.paths -}}
 {{- $extraPaths := .Values.server.ingressGrpc.extraPaths -}}
-{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: {{ include "argo-cd.ingress.apiVersion" . }}
-apiVersion: networking.k8s.io/v1beta1
-{{ else }}
-apiVersion: extensions/v1beta1
-{{ end -}}
 kind: Ingress
 metadata:
 {{- if .Values.server.ingressGrpc.annotations }}
@@ -23,6 +19,11 @@ metadata:
     {{- toYaml .Values.server.ingressGrpc.labels | nindent 4 }}
     {{- end }}
 spec:
+  {{- if eq (include "argo-cd.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+  {{- with .Values.server.ingress.ingressClassName }}
+  ingressClassName: {{ . }}
+  {{- end }}
+  {{- end }}
   rules:
   {{- if .Values.server.ingressGrpc.hosts }}
     {{- range $host := .Values.server.ingressGrpc.hosts }}
@@ -34,9 +35,23 @@ spec:
           {{- end -}}
           {{- range $p := $paths }}
           - path: {{ $p }}
+            {{- if eq (include "argo-cd.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+            pathType: Prefix
+            {{- end }}
             backend:
+              {{- if eq (include "argo-cd.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+              service:
+                name: {{ $serviceName }}
+                port:
+                  {{- if kindIs "float64" $servicePort }}
+                  number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
+              {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
+              {{- end }}
           {{- end -}}
     {{- end -}}
   {{- else }}
@@ -47,9 +62,23 @@ spec:
           {{- end -}}
           {{- range $p := $paths }}
           - path: {{ $p }}
+            {{- if eq (include "argo-cd.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+            pathType: Prefix
+            {{- end }}
             backend:
+              {{- if eq (include "argo-cd.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+              service:
+                name: {{ $serviceName }}
+                port:
+                  {{- if kindIs "float64" $servicePort }}
+                  number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
+              {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
+              {{- end }}
           {{- end -}}
   {{- end -}}
   {{- if .Values.server.ingressGrpc.tls }}

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

@@ -3,11 +3,7 @@
 {{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingress.https -}}
 {{- $paths := .Values.server.ingress.paths -}}
 {{- $extraPaths := .Values.server.ingress.extraPaths -}}
-{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: {{ include "argo-cd.ingress.apiVersion" . }}
-apiVersion: networking.k8s.io/v1beta1
-{{ else }}
-apiVersion: extensions/v1beta1
-{{ end -}}
 kind: Ingress
 metadata:
 {{- if .Values.server.ingress.annotations }}
@@ -23,6 +19,11 @@ metadata:
     {{- toYaml .Values.server.ingress.labels | nindent 4 }}
     {{- end }}
 spec:
+  {{- if eq (include "argo-cd.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+  {{- with .Values.server.ingress.ingressClassName }}
+  ingressClassName: {{ . }}
+  {{- end }}
+  {{- end }}
   rules:
   {{- if .Values.server.ingress.hosts }}
     {{- range $host := .Values.server.ingress.hosts }}
@@ -34,9 +35,23 @@ spec:
           {{- end }}
           {{- range $p := $paths }}
           - path: {{ $p }}
+            {{- if eq (include "argo-cd.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+            pathType: Prefix
+            {{- end }}
             backend:
+              {{- if eq (include "argo-cd.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+              service:
+                name: {{ $serviceName }}
+                port:
+                  {{- if kindIs "float64" $servicePort }}
+                  number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
+              {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
+              {{- end }}
           {{- end -}}
     {{- end -}}
   {{- else }}
@@ -47,9 +62,23 @@ spec:
           {{- end }}
           {{- range $p := $paths }}
           - path: {{ $p }}
+            {{- if eq (include "argo-cd.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+            pathType: Prefix
+            {{- end }}
             backend:
+              {{- if eq (include "argo-cd.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+              service:
+                name: {{ $serviceName }}
+                port:
+                  {{- if kindIs "float64" $servicePort }}
+                  number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
+              {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
+              {{- end }}
           {{- end -}}
   {{- end -}}
   {{- if .Values.server.ingress.tls }}

charts/argo-cd/templates/dex/deployment.yaml

@@ -44,8 +44,8 @@ spec:
         command:
         - cp
         - -n
-        - /usr/local/bin/argocd-util
+        - /usr/local/bin/argocd
-        - /shared
+        - /shared/argocd-dex
         volumeMounts:
         - mountPath: /shared
           name: static-files
@@ -54,7 +54,7 @@ spec:
         image: {{ .Values.dex.image.repository }}:{{ .Values.dex.image.tag }}
         imagePullPolicy: {{ .Values.dex.image.imagePullPolicy }}
         command:
-        - /shared/argocd-util
+        - /shared/argocd-dex
         - rundex
         {{- if .Values.dex.containerSecurityContext }}
         securityContext: {{- toYaml .Values.dex.containerSecurityContext | nindent 10 }}

charts/argo-cd/templates/dex/serviceaccount.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.dex.serviceAccount.create }}
+{{- if and .Values.dex.enabled .Values.dex.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.dex.serviceAccount.automountServiceAccountToken }}

charts/argo-cd/templates/redis/deployment.yaml

@@ -41,6 +41,9 @@ spec:
         - ""
         - --appendonly
         - "no"
+        {{- with .Values.redis.extraArgs }}
+        {{- . | toYaml | nindent 8 }}
+        {{- end }}
         image: {{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }}
         imagePullPolicy: {{ .Values.redis.image.imagePullPolicy}}
         {{- if .Values.redis.containerSecurityContext }}

charts/argo-cd/values.yaml

@@ -9,8 +9,8 @@ installCRDs: true
 
 global:
   image:
-    repository: argoproj/argocd
+    repository: quay.io/argoproj/argocd
-    tag: v1.8.4
+    tag: v2.0.0
     imagePullPolicy: IfNotPresent
   securityContext: {}
   #  runAsUser: 999
@@ -27,8 +27,8 @@ controller:
   name: application-controller
 
   image:
-    repository: # argoproj/argocd
+    repository: # defaults to global.image.repository
-    tag: # v1.7.11
+    tag: # defaults to global.image.tag
     imagePullPolicy: # IfNotPresent
 
   # If changing the number of replicas you must pass the number as ARGOCD_CONTROLLER_REPLICAS as an environment variable
@@ -276,9 +276,15 @@ redis:
 
   image:
     repository: redis
-    tag: 5.0.10-alpine
+    tag: 6.2.1-alpine
     imagePullPolicy: IfNotPresent
 
+  ## Additional command line arguments to pass to redis-server
+  ##
+  extraArgs: []
+  # - --bind
+  # - "0.0.0.0"
+
   containerPort: 6379
   servicePort: 6379
 
@@ -347,7 +353,7 @@ redis-ha:
     metrics:
       enabled: true
   image:
-    tag: 5.0.8-alpine
+    tag: 6.2.1-alpine
 
 ## Server
 server:
@@ -363,8 +369,8 @@ server:
     targetMemoryUtilizationPercentage: 50
 
   image:
-    repository: # argoproj/argocd
+    repository: # defaults to global.image.repository
-    tag: # v1.7.11
+    tag: # defaults to global.image.tag
     imagePullPolicy: # IfNotPresent
 
   ## Additional command line arguments to pass to argocd-server
@@ -493,6 +499,7 @@ server:
     enabled: false
     annotations: {}
     labels: {}
+    ingressClassName: ""
 
     ## Argo Ingress.
     ## Hostnames must be provided if Ingress is enabled.
@@ -521,6 +528,7 @@ server:
     enabled: false
     annotations: {}
     labels: {}
+    ingressClassName: ""
 
     ## Argo Ingress.
     ## Hostnames must be provided if Ingress is enabled.
@@ -731,8 +739,8 @@ repoServer:
     targetMemoryUtilizationPercentage: 50
 
   image:
-    repository: # argoproj/argocd
+    repository: # defaults to global.image.repository
-    tag: # v1.7.11
+    tag: # defaults to global.image.tag
     imagePullPolicy: # IfNotPresent
 
   ## Additional command line arguments to pass to argocd-repo-server
@@ -872,6 +880,31 @@ repoServer:
 
 ## Argo Configs
 configs:
+  ## External Cluster Credentials
+  ## reference:
+  ## - https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#clusters
+  ## - https://argoproj.github.io/argo-cd/operator-manual/security/#external-cluster-credentials
+  clusterCredentials: []
+    # - name: mycluster
+    #   server: https://mycluster.com
+    #   labels: {}
+    #   annotations: {}
+    #   config:
+    #     bearerToken: "<authentication token>"
+    #     tlsClientConfig:
+    #       insecure: false
+    #       caData: "<base64 encoded certificate>"
+    # - name: mycluster2
+    #   server: https://mycluster2.com
+    #   labels: {}
+    #   annotations: {}
+    #   namespaces: namespace1,namespace2
+    #   config:
+    #     bearerToken: "<authentication token>"
+    #     tlsClientConfig:
+    #       insecure: false
+    #       caData: "<base64 encoded certificate>"
+
   knownHostsAnnotations: {}
   knownHosts:
     data:

charts/argo-ci/Chart.yaml

@@ -1,11 +1,12 @@
-apiVersion: v1
+apiVersion: v2
 description: A Helm chart for Argo-CI
 name: argo-ci
-version: 0.1.7
+version: 1.0.0
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 appVersion: v1.0.0-alpha2
 home: https://github.com/argoproj/argo-helm
-maintainers:
+deprecated: true
-  - name: alexec
+dependencies:
-  - name: alexmt
+  - name: argo
-  - name: jessesuen
+    version: "^0.16.0"
+    repository: https://argoproj.github.io/argo-helm

charts/argo-ci/README.md

@@ -1,3 +1,5 @@
 # Argo CI Chart
 
+**Deprecated** - Use [Argo-Events](./argo-events) instead.
+
 This is a **community maintained** chart.

charts/argo-ci/requirements.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: argo
-  repository: https://argoproj.github.io/argo-helm
-  version: 0.2.1
-digest: sha256:af0f837200061b1720c0e05168dfc4a9537582f3004de62eeb5ef01b4c78db64
-generated: 2018-10-23T14:50:47.570677461-07:00

charts/argo-ci/requirements.yaml

@@ -1,4 +0,0 @@
-dependencies:
-- name: argo
-  version: 0.2.1
-  repository: https://argoproj.github.io/argo-helm

charts/argo-events/templates/argo-events-cluster-roles.yaml

@@ -47,10 +47,13 @@ rules:
       - workflowtemplates/finalizers
       - sensors
       - sensors/finalizers
+      - sensors/status
       - eventsources
       - eventsources/finalizers
+      - eventsources/status
       - eventbus
       - eventbus/finalizers
+      - eventbus/status
   - apiGroups:
       - ""
     resources:

charts/argo-events/templates/argo-events-roles.yaml

@@ -49,10 +49,13 @@ rules:
       - workflowtemplates/finalizers
       - sensors
       - sensors/finalizers
+      - sensors/status
       - eventsources
       - eventsources/finalizers
+      - eventsources/status
       - eventbus
       - eventbus/finalizers
+      - eventbus/status
   - apiGroups:
       - ""
     resources:

charts/argo-events/templates/eventbus-controller-deployment.yaml

@@ -18,6 +18,12 @@ spec:
       labels:
         app: {{ .Release.Name }}-{{ .Values.eventbusController.name }}
         release: {{ .Release.Name }}
+        {{- with .Values.eventbusController.podLabels }}
+        {{- tpl (toYaml .) $ | nindent 8 }}
+        {{- end }}
+      {{- with .Values.eventbusController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
@@ -49,6 +55,9 @@ spec:
               port: 8081
             initialDelaySeconds: 3
             periodSeconds: 3
+      {{- with .Values.eventbusController.priorityClassName }}
+      priorityClassName: {{ . | quote }}
+      {{- end }}
       {{- with .Values.securityContext }}
       securityContext: {{- toYaml . | nindent 8 }}
       {{- end }}

charts/argo-events/templates/eventsource-controller-deployment.yaml

@@ -18,6 +18,12 @@ spec:
       labels:
         app: {{ .Release.Name }}-{{ .Values.eventsourceController.name }}
         release: {{ .Release.Name }}
+        {{- with .Values.eventsourceController.podLabels }}
+        {{- tpl (toYaml .) $ | nindent 8 }}
+        {{- end }}
+      {{- with .Values.eventsourceController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
@@ -47,6 +53,9 @@ spec:
               port: 8081
             initialDelaySeconds: 3
             periodSeconds: 3
+      {{- with .Values.eventsourceController.priorityClassName }}
+      priorityClassName: {{ . | quote }}
+      {{- end }}
       {{- with .Values.securityContext }}
       securityContext: {{- toYaml . | nindent 8 }}
       {{- end }}

charts/argo-events/templates/sensor-controller-deployment.yaml

@@ -18,6 +18,12 @@ spec:
       labels:
         app: {{ .Release.Name }}-{{ .Values.sensorController.name }}
         release: {{ .Release.Name }}
+        {{- with .Values.sensorController.podLabels }}
+        {{- tpl (toYaml .) $ | nindent 8 }}
+        {{- end }}
+      {{- with .Values.sensorController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
@@ -47,6 +53,9 @@ spec:
               port: 8081
             initialDelaySeconds: 3
             periodSeconds: 3
+      {{- with .Values.sensorController.priorityClassName }}
+      priorityClassName: {{ . | quote }}
+      {{- end }}
       {{- with .Values.securityContext }}
       securityContext: {{- toYaml . | nindent 8 }}
       {{- end }}

charts/argo-events/values.yaml

@@ -51,8 +51,11 @@ sensorController:
   tag: v1.2.3
   replicaCount: 1
   sensorImage: sensor
+  podAnnotations: {}
   nodeSelector: {}
-  tolerations: {}
+  podLabels: {}
+  priorityClassName: ""
+  tolerations: []
   affinity: {}
 
 eventsourceController:
@@ -61,8 +64,11 @@ eventsourceController:
   tag: v1.2.3
   replicaCount: 1
   eventsourceImage: eventsource
+  podAnnotations: {}
   nodeSelector: {}
-  tolerations: {}
+  podLabels: {}
+  priorityClassName: ""
+  tolerations: []
   affinity: {}
 
 eventbusController:
@@ -70,8 +76,11 @@ eventbusController:
   image: eventbus-controller
   tag: v1.2.3
   replicaCount: 1
+  podAnnotations: {}
   nodeSelector: {}
-  tolerations: {}
+  podLabels: {}
+  priorityClassName: ""
+  tolerations: []
   affinity: {}
   natsStreamingImage: nats-streaming:0.17.0
   natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2

charts/argo-rollouts/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.10.2"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 0.4.3
+version: 0.5.0
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:

charts/argo-rollouts/README.md

@@ -2,7 +2,7 @@ Argo Rollouts Chart
 =============
 A Helm chart for Argo Rollouts, progressive delivery for Kubernetes.
 
-Current chart version is `0.4.0`
+Current chart version is `0.5.0`
 
 Source code can be found [here](https://github.com/argoproj/argo-rollouts)
 
@@ -42,6 +42,7 @@ $ helm install --name my-release argo/argo-rollouts
 | controller.metrics.serviceMonitor.enabled | bool | `false` |  |
 | imagePullSecrets | list | `[]` |  |
 | installCRDs | bool | `true` |  |
+| crdAnnotations | object | `{}` |  |
 | podAnnotations | object | `{}` |  |
 | podLabels | object | `{}` |  |
 | serviceAccount.name | string | `"argo-rollouts"` |  |

charts/argo-rollouts/templates/crds/analysis-run-crd.yaml

@@ -3,7 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+    {{- if .Values.crdAnnotations }}
+{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- end }}
   name: analysisruns.argoproj.io
 spec:
   group: argoproj.io
@@ -16,15 +19,12 @@ spec:
     singular: analysisrun
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
-    served: true
+    - description: AnalysisRun status
-    storage: true
+      jsonPath: .status.phase
-    additionalPrinterColumns:
-    - jsonPath: .status.phase
-      description: AnalysisRun status
       name: Status
       type: string
-    subresources: {}
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         properties:
@@ -723,11 +723,16 @@ spec:
                                                     name:
                                                       type: string
                                                     protocol:
+                                                      default: TCP
                                                       type: string
                                                   required:
                                                   - containerPort
                                                   type: object
                                                 type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                               readinessProbe:
                                                 properties:
                                                   exec:
@@ -794,6 +799,11 @@ spec:
                                                     type: integer
                                                 type: object
                                               resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                 type: object
                                               securityContext:
                                                 properties:
@@ -1271,6 +1281,7 @@ spec:
                                                     name:
                                                       type: string
                                                     protocol:
+                                                      default: TCP
                                                       type: string
                                                   required:
                                                   - containerPort
@@ -1342,6 +1353,11 @@ spec:
                                                     type: integer
                                                 type: object
                                               resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                 type: object
                                               securityContext:
                                                 properties:
@@ -1823,11 +1839,16 @@ spec:
                                                     name:
                                                       type: string
                                                     protocol:
+                                                      default: TCP
                                                       type: string
                                                   required:
                                                   - containerPort
                                                   type: object
                                                 type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                               readinessProbe:
                                                 properties:
                                                   exec:
@@ -1894,6 +1915,11 @@ spec:
                                                     type: integer
                                                 type: object
                                               resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                 type: object
                                               securityContext:
                                                 properties:
@@ -2233,503 +2259,12 @@ spec:
                                             - whenUnsatisfiable
                                             type: object
                                           type: array
+                                          x-kubernetes-list-map-keys:
+                                          - topologyKey
+                                          - whenUnsatisfiable
+                                          x-kubernetes-list-type: map
                                         volumes:
-                                          items:
+                                          x-kubernetes-preserve-unknown-fields: true
-                                            properties:
-                                              awsElasticBlockStore:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              azureDisk:
-                                                properties:
-                                                  cachingMode:
-                                                    type: string
-                                                  diskName:
-                                                    type: string
-                                                  diskURI:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  kind:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - diskName
-                                                - diskURI
-                                                type: object
-                                              azureFile:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretName:
-                                                    type: string
-                                                  shareName:
-                                                    type: string
-                                                required:
-                                                - secretName
-                                                - shareName
-                                                type: object
-                                              cephfs:
-                                                properties:
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretFile:
-                                                    type: string
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - monitors
-                                                type: object
-                                              cinder:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              csi:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  nodePublishSecretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeAttributes:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              emptyDir:
-                                                properties:
-                                                  medium:
-                                                    type: string
-                                                  sizeLimit:
-                                                    anyOf:
-                                                    - type: integer
-                                                    - type: string
-                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                    x-kubernetes-int-or-string: true
-                                                type: object
-                                              ephemeral:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeClaimTemplate:
-                                                    properties:
-                                                      metadata:
-                                                        type: object
-                                                      spec:
-                                                        properties:
-                                                          accessModes:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                          dataSource:
-                                                            properties:
-                                                              apiGroup:
-                                                                type: string
-                                                              kind:
-                                                                type: string
-                                                              name:
-                                                                type: string
-                                                            required:
-                                                            - kind
-                                                            - name
-                                                            type: object
-                                                          resources:
-                                                            properties:
-                                                              limits:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                              requests:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                            type: object
-                                                          selector:
-                                                            properties:
-                                                              matchExpressions:
-                                                                items:
-                                                                  properties:
-                                                                    key:
-                                                                      type: string
-                                                                    operator:
-                                                                      type: string
-                                                                    values:
-                                                                      items:
-                                                                        type: string
-                                                                      type: array
-                                                                  required:
-                                                                  - key
-                                                                  - operator
-                                                                  type: object
-                                                                type: array
-                                                              matchLabels:
-                                                                additionalProperties:
-                                                                  type: string
-                                                                type: object
-                                                            type: object
-                                                          storageClassName:
-                                                            type: string
-                                                          volumeMode:
-                                                            type: string
-                                                          volumeName:
-                                                            type: string
-                                                        type: object
-                                                    required:
-                                                    - spec
-                                                    type: object
-                                                type: object
-                                              fc:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  targetWWNs:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  wwids:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              flexVolume:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  options:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              flocker:
-                                                properties:
-                                                  datasetName:
-                                                    type: string
-                                                  datasetUUID:
-                                                    type: string
-                                                type: object
-                                              gcePersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  pdName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - pdName
-                                                type: object
-                                              gitRepo:
-                                                properties:
-                                                  directory:
-                                                    type: string
-                                                  repository:
-                                                    type: string
-                                                  revision:
-                                                    type: string
-                                                required:
-                                                - repository
-                                                type: object
-                                              glusterfs:
-                                                properties:
-                                                  endpoints:
-                                                    type: string
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - endpoints
-                                                - path
-                                                type: object
-                                              hostPath:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  type:
-                                                    type: string
-                                                required:
-                                                - path
-                                                type: object
-                                              iscsi:
-                                                properties:
-                                                  chapAuthDiscovery:
-                                                    type: boolean
-                                                  chapAuthSession:
-                                                    type: boolean
-                                                  fsType:
-                                                    type: string
-                                                  initiatorName:
-                                                    type: string
-                                                  iqn:
-                                                    type: string
-                                                  iscsiInterface:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  portals:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  targetPortal:
-                                                    type: string
-                                                required:
-                                                - iqn
-                                                - lun
-                                                - targetPortal
-                                                type: object
-                                              name:
-                                                type: string
-                                              nfs:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  server:
-                                                    type: string
-                                                required:
-                                                - path
-                                                - server
-                                                type: object
-                                              persistentVolumeClaim:
-                                                properties:
-                                                  claimName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - claimName
-                                                type: object
-                                              photonPersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  pdID:
-                                                    type: string
-                                                required:
-                                                - pdID
-                                                type: object
-                                              portworxVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              projected:
-                                                properties:
-                                                  defaultMode:
-                                                    format: int32
-                                                    type: integer
-                                                  sources:
-                                                    items:
-                                                      properties:
-                                                        serviceAccountToken:
-                                                          properties:
-                                                            audience:
-                                                              type: string
-                                                            expirationSeconds:
-                                                              format: int64
-                                                              type: integer
-                                                            path:
-                                                              type: string
-                                                          required:
-                                                          - path
-                                                          type: object
-                                                      type: object
-                                                    type: array
-                                                required:
-                                                - sources
-                                                type: object
-                                              quobyte:
-                                                properties:
-                                                  group:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  registry:
-                                                    type: string
-                                                  tenant:
-                                                    type: string
-                                                  user:
-                                                    type: string
-                                                  volume:
-                                                    type: string
-                                                required:
-                                                - registry
-                                                - volume
-                                                type: object
-                                              rbd:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  image:
-                                                    type: string
-                                                  keyring:
-                                                    type: string
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  pool:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - image
-                                                - monitors
-                                                type: object
-                                              scaleIO:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  gateway:
-                                                    type: string
-                                                  protectionDomain:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  sslEnabled:
-                                                    type: boolean
-                                                  storageMode:
-                                                    type: string
-                                                  storagePool:
-                                                    type: string
-                                                  system:
-                                                    type: string
-                                                  volumeName:
-                                                    type: string
-                                                required:
-                                                - gateway
-                                                - secretRef
-                                                - system
-                                                type: object
-                                              storageos:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeName:
-                                                    type: string
-                                                  volumeNamespace:
-                                                    type: string
-                                                type: object
-                                              vsphereVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  storagePolicyID:
-                                                    type: string
-                                                  storagePolicyName:
-                                                    type: string
-                                                  volumePath:
-                                                    type: string
-                                                required:
-                                                - volumePath
-                                                type: object
-                                            required:
-                                            - name
-                                            type: object
-                                          type: array
                                       required:
                                       - containers
                                       type: object
@@ -2960,4 +2495,7 @@ spec:
         required:
         - spec
         type: object
+    served: true
+    storage: true
+    subresources: {}
 {{- end }}

charts/argo-rollouts/templates/crds/analysis-template-crd.yaml

@@ -3,7 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+    {{- if .Values.crdAnnotations }}
+{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- end }}
   name: analysistemplates.argoproj.io
 spec:
   group: argoproj.io
@@ -17,8 +20,6 @@ spec:
   scope: Namespaced
   versions:
   - name: v1alpha1
-    served: true
-    storage: true
     schema:
       openAPIV3Schema:
         properties:
@@ -717,11 +718,16 @@ spec:
                                                     name:
                                                       type: string
                                                     protocol:
+                                                      default: TCP
                                                       type: string
                                                   required:
                                                   - containerPort
                                                   type: object
                                                 type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                               readinessProbe:
                                                 properties:
                                                   exec:
@@ -788,6 +794,11 @@ spec:
                                                     type: integer
                                                 type: object
                                               resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                 type: object
                                               securityContext:
                                                 properties:
@@ -1265,6 +1276,7 @@ spec:
                                                     name:
                                                       type: string
                                                     protocol:
+                                                      default: TCP
                                                       type: string
                                                   required:
                                                   - containerPort
@@ -1336,6 +1348,11 @@ spec:
                                                     type: integer
                                                 type: object
                                               resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                 type: object
                                               securityContext:
                                                 properties:
@@ -1817,11 +1834,16 @@ spec:
                                                     name:
                                                       type: string
                                                     protocol:
+                                                      default: TCP
                                                       type: string
                                                   required:
                                                   - containerPort
                                                   type: object
                                                 type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                               readinessProbe:
                                                 properties:
                                                   exec:
@@ -1888,6 +1910,11 @@ spec:
                                                     type: integer
                                                 type: object
                                               resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                 type: object
                                               securityContext:
                                                 properties:
@@ -2227,503 +2254,12 @@ spec:
                                             - whenUnsatisfiable
                                             type: object
                                           type: array
+                                          x-kubernetes-list-map-keys:
+                                          - topologyKey
+                                          - whenUnsatisfiable
+                                          x-kubernetes-list-type: map
                                         volumes:
-                                          items:
+                                          x-kubernetes-preserve-unknown-fields: true
-                                            properties:
-                                              awsElasticBlockStore:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              azureDisk:
-                                                properties:
-                                                  cachingMode:
-                                                    type: string
-                                                  diskName:
-                                                    type: string
-                                                  diskURI:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  kind:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - diskName
-                                                - diskURI
-                                                type: object
-                                              azureFile:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretName:
-                                                    type: string
-                                                  shareName:
-                                                    type: string
-                                                required:
-                                                - secretName
-                                                - shareName
-                                                type: object
-                                              cephfs:
-                                                properties:
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretFile:
-                                                    type: string
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - monitors
-                                                type: object
-                                              cinder:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              csi:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  nodePublishSecretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeAttributes:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              emptyDir:
-                                                properties:
-                                                  medium:
-                                                    type: string
-                                                  sizeLimit:
-                                                    anyOf:
-                                                    - type: integer
-                                                    - type: string
-                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                    x-kubernetes-int-or-string: true
-                                                type: object
-                                              ephemeral:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeClaimTemplate:
-                                                    properties:
-                                                      metadata:
-                                                        type: object
-                                                      spec:
-                                                        properties:
-                                                          accessModes:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                          dataSource:
-                                                            properties:
-                                                              apiGroup:
-                                                                type: string
-                                                              kind:
-                                                                type: string
-                                                              name:
-                                                                type: string
-                                                            required:
-                                                            - kind
-                                                            - name
-                                                            type: object
-                                                          resources:
-                                                            properties:
-                                                              limits:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                              requests:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                            type: object
-                                                          selector:
-                                                            properties:
-                                                              matchExpressions:
-                                                                items:
-                                                                  properties:
-                                                                    key:
-                                                                      type: string
-                                                                    operator:
-                                                                      type: string
-                                                                    values:
-                                                                      items:
-                                                                        type: string
-                                                                      type: array
-                                                                  required:
-                                                                  - key
-                                                                  - operator
-                                                                  type: object
-                                                                type: array
-                                                              matchLabels:
-                                                                additionalProperties:
-                                                                  type: string
-                                                                type: object
-                                                            type: object
-                                                          storageClassName:
-                                                            type: string
-                                                          volumeMode:
-                                                            type: string
-                                                          volumeName:
-                                                            type: string
-                                                        type: object
-                                                    required:
-                                                    - spec
-                                                    type: object
-                                                type: object
-                                              fc:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  targetWWNs:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  wwids:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              flexVolume:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  options:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              flocker:
-                                                properties:
-                                                  datasetName:
-                                                    type: string
-                                                  datasetUUID:
-                                                    type: string
-                                                type: object
-                                              gcePersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  pdName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - pdName
-                                                type: object
-                                              gitRepo:
-                                                properties:
-                                                  directory:
-                                                    type: string
-                                                  repository:
-                                                    type: string
-                                                  revision:
-                                                    type: string
-                                                required:
-                                                - repository
-                                                type: object
-                                              glusterfs:
-                                                properties:
-                                                  endpoints:
-                                                    type: string
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - endpoints
-                                                - path
-                                                type: object
-                                              hostPath:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  type:
-                                                    type: string
-                                                required:
-                                                - path
-                                                type: object
-                                              iscsi:
-                                                properties:
-                                                  chapAuthDiscovery:
-                                                    type: boolean
-                                                  chapAuthSession:
-                                                    type: boolean
-                                                  fsType:
-                                                    type: string
-                                                  initiatorName:
-                                                    type: string
-                                                  iqn:
-                                                    type: string
-                                                  iscsiInterface:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  portals:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  targetPortal:
-                                                    type: string
-                                                required:
-                                                - iqn
-                                                - lun
-                                                - targetPortal
-                                                type: object
-                                              name:
-                                                type: string
-                                              nfs:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  server:
-                                                    type: string
-                                                required:
-                                                - path
-                                                - server
-                                                type: object
-                                              persistentVolumeClaim:
-                                                properties:
-                                                  claimName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - claimName
-                                                type: object
-                                              photonPersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  pdID:
-                                                    type: string
-                                                required:
-                                                - pdID
-                                                type: object
-                                              portworxVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              projected:
-                                                properties:
-                                                  defaultMode:
-                                                    format: int32
-                                                    type: integer
-                                                  sources:
-                                                    items:
-                                                      properties:
-                                                        serviceAccountToken:
-                                                          properties:
-                                                            audience:
-                                                              type: string
-                                                            expirationSeconds:
-                                                              format: int64
-                                                              type: integer
-                                                            path:
-                                                              type: string
-                                                          required:
-                                                          - path
-                                                          type: object
-                                                      type: object
-                                                    type: array
-                                                required:
-                                                - sources
-                                                type: object
-                                              quobyte:
-                                                properties:
-                                                  group:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  registry:
-                                                    type: string
-                                                  tenant:
-                                                    type: string
-                                                  user:
-                                                    type: string
-                                                  volume:
-                                                    type: string
-                                                required:
-                                                - registry
-                                                - volume
-                                                type: object
-                                              rbd:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  image:
-                                                    type: string
-                                                  keyring:
-                                                    type: string
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  pool:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - image
-                                                - monitors
-                                                type: object
-                                              scaleIO:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  gateway:
-                                                    type: string
-                                                  protectionDomain:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  sslEnabled:
-                                                    type: boolean
-                                                  storageMode:
-                                                    type: string
-                                                  storagePool:
-                                                    type: string
-                                                  system:
-                                                    type: string
-                                                  volumeName:
-                                                    type: string
-                                                required:
-                                                - gateway
-                                                - secretRef
-                                                - system
-                                                type: object
-                                              storageos:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeName:
-                                                    type: string
-                                                  volumeNamespace:
-                                                    type: string
-                                                type: object
-                                              vsphereVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  storagePolicyID:
-                                                    type: string
-                                                  storagePolicyName:
-                                                    type: string
-                                                  volumePath:
-                                                    type: string
-                                                required:
-                                                - volumePath
-                                                type: object
-                                            required:
-                                            - name
-                                            type: object
-                                          type: array
                                       required:
                                       - containers
                                       type: object
@@ -2882,4 +2418,6 @@ spec:
         required:
         - spec
         type: object
+    served: true
+    storage: true
 {{- end }}

charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml

@@ -3,7 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+    {{- if .Values.crdAnnotations }}
+{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- end }}
   name: clusteranalysistemplates.argoproj.io
 spec:
   group: argoproj.io
@@ -17,8 +20,6 @@ spec:
   scope: Cluster
   versions:
   - name: v1alpha1
-    served: true
-    storage: true
     schema:
       openAPIV3Schema:
         properties:
@@ -717,11 +718,16 @@ spec:
                                                     name:
                                                       type: string
                                                     protocol:
+                                                      default: TCP
                                                       type: string
                                                   required:
                                                   - containerPort
                                                   type: object
                                                 type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                               readinessProbe:
                                                 properties:
                                                   exec:
@@ -788,6 +794,11 @@ spec:
                                                     type: integer
                                                 type: object
                                               resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                 type: object
                                               securityContext:
                                                 properties:
@@ -1265,6 +1276,7 @@ spec:
                                                     name:
                                                       type: string
                                                     protocol:
+                                                      default: TCP
                                                       type: string
                                                   required:
                                                   - containerPort
@@ -1336,6 +1348,11 @@ spec:
                                                     type: integer
                                                 type: object
                                               resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                 type: object
                                               securityContext:
                                                 properties:
@@ -1817,11 +1834,16 @@ spec:
                                                     name:
                                                       type: string
                                                     protocol:
+                                                      default: TCP
                                                       type: string
                                                   required:
                                                   - containerPort
                                                   type: object
                                                 type: array
+                                                x-kubernetes-list-map-keys:
+                                                - containerPort
+                                                - protocol
+                                                x-kubernetes-list-type: map
                                               readinessProbe:
                                                 properties:
                                                   exec:
@@ -1888,6 +1910,11 @@ spec:
                                                     type: integer
                                                 type: object
                                               resources:
+                                                properties:
+                                                  limits:
+                                                    x-kubernetes-preserve-unknown-fields: true
+                                                  requests:
+                                                    x-kubernetes-preserve-unknown-fields: true
                                                 type: object
                                               securityContext:
                                                 properties:
@@ -2227,503 +2254,12 @@ spec:
                                             - whenUnsatisfiable
                                             type: object
                                           type: array
+                                          x-kubernetes-list-map-keys:
+                                          - topologyKey
+                                          - whenUnsatisfiable
+                                          x-kubernetes-list-type: map
                                         volumes:
-                                          items:
+                                          x-kubernetes-preserve-unknown-fields: true
-                                            properties:
-                                              awsElasticBlockStore:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              azureDisk:
-                                                properties:
-                                                  cachingMode:
-                                                    type: string
-                                                  diskName:
-                                                    type: string
-                                                  diskURI:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  kind:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - diskName
-                                                - diskURI
-                                                type: object
-                                              azureFile:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretName:
-                                                    type: string
-                                                  shareName:
-                                                    type: string
-                                                required:
-                                                - secretName
-                                                - shareName
-                                                type: object
-                                              cephfs:
-                                                properties:
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretFile:
-                                                    type: string
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - monitors
-                                                type: object
-                                              cinder:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              csi:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  nodePublishSecretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeAttributes:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              emptyDir:
-                                                properties:
-                                                  medium:
-                                                    type: string
-                                                  sizeLimit:
-                                                    anyOf:
-                                                    - type: integer
-                                                    - type: string
-                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                    x-kubernetes-int-or-string: true
-                                                type: object
-                                              ephemeral:
-                                                properties:
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeClaimTemplate:
-                                                    properties:
-                                                      metadata:
-                                                        type: object
-                                                      spec:
-                                                        properties:
-                                                          accessModes:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                          dataSource:
-                                                            properties:
-                                                              apiGroup:
-                                                                type: string
-                                                              kind:
-                                                                type: string
-                                                              name:
-                                                                type: string
-                                                            required:
-                                                            - kind
-                                                            - name
-                                                            type: object
-                                                          resources:
-                                                            properties:
-                                                              limits:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                              requests:
-                                                                additionalProperties:
-                                                                  anyOf:
-                                                                  - type: integer
-                                                                  - type: string
-                                                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                                  x-kubernetes-int-or-string: true
-                                                                type: object
-                                                            type: object
-                                                          selector:
-                                                            properties:
-                                                              matchExpressions:
-                                                                items:
-                                                                  properties:
-                                                                    key:
-                                                                      type: string
-                                                                    operator:
-                                                                      type: string
-                                                                    values:
-                                                                      items:
-                                                                        type: string
-                                                                      type: array
-                                                                  required:
-                                                                  - key
-                                                                  - operator
-                                                                  type: object
-                                                                type: array
-                                                              matchLabels:
-                                                                additionalProperties:
-                                                                  type: string
-                                                                type: object
-                                                            type: object
-                                                          storageClassName:
-                                                            type: string
-                                                          volumeMode:
-                                                            type: string
-                                                          volumeName:
-                                                            type: string
-                                                        type: object
-                                                    required:
-                                                    - spec
-                                                    type: object
-                                                type: object
-                                              fc:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  readOnly:
-                                                    type: boolean
-                                                  targetWWNs:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  wwids:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              flexVolume:
-                                                properties:
-                                                  driver:
-                                                    type: string
-                                                  fsType:
-                                                    type: string
-                                                  options:
-                                                    additionalProperties:
-                                                      type: string
-                                                    type: object
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                required:
-                                                - driver
-                                                type: object
-                                              flocker:
-                                                properties:
-                                                  datasetName:
-                                                    type: string
-                                                  datasetUUID:
-                                                    type: string
-                                                type: object
-                                              gcePersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  partition:
-                                                    format: int32
-                                                    type: integer
-                                                  pdName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - pdName
-                                                type: object
-                                              gitRepo:
-                                                properties:
-                                                  directory:
-                                                    type: string
-                                                  repository:
-                                                    type: string
-                                                  revision:
-                                                    type: string
-                                                required:
-                                                - repository
-                                                type: object
-                                              glusterfs:
-                                                properties:
-                                                  endpoints:
-                                                    type: string
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - endpoints
-                                                - path
-                                                type: object
-                                              hostPath:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  type:
-                                                    type: string
-                                                required:
-                                                - path
-                                                type: object
-                                              iscsi:
-                                                properties:
-                                                  chapAuthDiscovery:
-                                                    type: boolean
-                                                  chapAuthSession:
-                                                    type: boolean
-                                                  fsType:
-                                                    type: string
-                                                  initiatorName:
-                                                    type: string
-                                                  iqn:
-                                                    type: string
-                                                  iscsiInterface:
-                                                    type: string
-                                                  lun:
-                                                    format: int32
-                                                    type: integer
-                                                  portals:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  targetPortal:
-                                                    type: string
-                                                required:
-                                                - iqn
-                                                - lun
-                                                - targetPortal
-                                                type: object
-                                              name:
-                                                type: string
-                                              nfs:
-                                                properties:
-                                                  path:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  server:
-                                                    type: string
-                                                required:
-                                                - path
-                                                - server
-                                                type: object
-                                              persistentVolumeClaim:
-                                                properties:
-                                                  claimName:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                required:
-                                                - claimName
-                                                type: object
-                                              photonPersistentDisk:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  pdID:
-                                                    type: string
-                                                required:
-                                                - pdID
-                                                type: object
-                                              portworxVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  volumeID:
-                                                    type: string
-                                                required:
-                                                - volumeID
-                                                type: object
-                                              projected:
-                                                properties:
-                                                  defaultMode:
-                                                    format: int32
-                                                    type: integer
-                                                  sources:
-                                                    items:
-                                                      properties:
-                                                        serviceAccountToken:
-                                                          properties:
-                                                            audience:
-                                                              type: string
-                                                            expirationSeconds:
-                                                              format: int64
-                                                              type: integer
-                                                            path:
-                                                              type: string
-                                                          required:
-                                                          - path
-                                                          type: object
-                                                      type: object
-                                                    type: array
-                                                required:
-                                                - sources
-                                                type: object
-                                              quobyte:
-                                                properties:
-                                                  group:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  registry:
-                                                    type: string
-                                                  tenant:
-                                                    type: string
-                                                  user:
-                                                    type: string
-                                                  volume:
-                                                    type: string
-                                                required:
-                                                - registry
-                                                - volume
-                                                type: object
-                                              rbd:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  image:
-                                                    type: string
-                                                  keyring:
-                                                    type: string
-                                                  monitors:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                  pool:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  user:
-                                                    type: string
-                                                required:
-                                                - image
-                                                - monitors
-                                                type: object
-                                              scaleIO:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  gateway:
-                                                    type: string
-                                                  protectionDomain:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  sslEnabled:
-                                                    type: boolean
-                                                  storageMode:
-                                                    type: string
-                                                  storagePool:
-                                                    type: string
-                                                  system:
-                                                    type: string
-                                                  volumeName:
-                                                    type: string
-                                                required:
-                                                - gateway
-                                                - secretRef
-                                                - system
-                                                type: object
-                                              storageos:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  readOnly:
-                                                    type: boolean
-                                                  secretRef:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    type: object
-                                                  volumeName:
-                                                    type: string
-                                                  volumeNamespace:
-                                                    type: string
-                                                type: object
-                                              vsphereVolume:
-                                                properties:
-                                                  fsType:
-                                                    type: string
-                                                  storagePolicyID:
-                                                    type: string
-                                                  storagePolicyName:
-                                                    type: string
-                                                  volumePath:
-                                                    type: string
-                                                required:
-                                                - volumePath
-                                                type: object
-                                            required:
-                                            - name
-                                            type: object
-                                          type: array
                                       required:
                                       - containers
                                       type: object
@@ -2882,4 +2418,6 @@ spec:
         required:
         - spec
         type: object
+    served: true
+    storage: true
 {{- end }}

charts/argo-rollouts/templates/crds/experiment-crd.yaml

@@ -3,7 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+    {{- if .Values.crdAnnotations }}
+{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- end }}
   name: experiments.argoproj.io
 spec:
   group: argoproj.io
@@ -16,15 +19,12 @@ spec:
     singular: experiment
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
-    served: true
+    - description: Experiment status
-    storage: true
+      jsonPath: .status.phase
-    subresources: {}
-    additionalPrinterColumns:
-    - jsonPath: .status.phase
-      description: Experiment status
       name: Status
       type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         properties:
@@ -684,11 +684,16 @@ spec:
                                         name:
                                           type: string
                                         protocol:
+                                          default: TCP
                                           type: string
                                       required:
                                       - containerPort
                                       type: object
                                     type: array
+                                    x-kubernetes-list-map-keys:
+                                    - containerPort
+                                    - protocol
+                                    x-kubernetes-list-type: map
                                   readinessProbe:
                                     properties:
                                       exec:
@@ -755,6 +760,11 @@ spec:
                                         type: integer
                                     type: object
                                   resources:
+                                    properties:
+                                      limits:
+                                        x-kubernetes-preserve-unknown-fields: true
+                                      requests:
+                                        x-kubernetes-preserve-unknown-fields: true
                                     type: object
                                   securityContext:
                                     properties:
@@ -796,6 +806,15 @@ spec:
                                           user:
                                             type: string
                                         type: object
+                                      seccompProfile:
+                                        properties:
+                                          localhostProfile:
+                                            type: string
+                                          type:
+                                            type: string
+                                        required:
+                                        - type
+                                        type: object
                                       windowsOptions:
                                         properties:
                                           gmsaCredentialSpec:
@@ -1223,6 +1242,7 @@ spec:
                                         name:
                                           type: string
                                         protocol:
+                                          default: TCP
                                           type: string
                                       required:
                                       - containerPort
@@ -1294,6 +1314,11 @@ spec:
                                         type: integer
                                     type: object
                                   resources:
+                                    properties:
+                                      limits:
+                                        x-kubernetes-preserve-unknown-fields: true
+                                      requests:
+                                        x-kubernetes-preserve-unknown-fields: true
                                     type: object
                                   securityContext:
                                     properties:
@@ -1335,6 +1360,15 @@ spec:
                                           user:
                                             type: string
                                         type: object
+                                      seccompProfile:
+                                        properties:
+                                          localhostProfile:
+                                            type: string
+                                          type:
+                                            type: string
+                                        required:
+                                        - type
+                                        type: object
                                       windowsOptions:
                                         properties:
                                           gmsaCredentialSpec:
@@ -1766,11 +1800,16 @@ spec:
                                         name:
                                           type: string
                                         protocol:
+                                          default: TCP
                                           type: string
                                       required:
                                       - containerPort
                                       type: object
                                     type: array
+                                    x-kubernetes-list-map-keys:
+                                    - containerPort
+                                    - protocol
+                                    x-kubernetes-list-type: map
                                   readinessProbe:
                                     properties:
                                       exec:
@@ -1837,6 +1876,11 @@ spec:
                                         type: integer
                                     type: object
                                   resources:
+                                    properties:
+                                      limits:
+                                        x-kubernetes-preserve-unknown-fields: true
+                                      requests:
+                                        x-kubernetes-preserve-unknown-fields: true
                                     type: object
                                   securityContext:
                                     properties:
@@ -1878,6 +1922,15 @@ spec:
                                           user:
                                             type: string
                                         type: object
+                                      seccompProfile:
+                                        properties:
+                                          localhostProfile:
+                                            type: string
+                                          type:
+                                            type: string
+                                        required:
+                                        - type
+                                        type: object
                                       windowsOptions:
                                         properties:
                                           gmsaCredentialSpec:
@@ -2063,6 +2116,15 @@ spec:
                                     user:
                                       type: string
                                   type: object
+                                seccompProfile:
+                                  properties:
+                                    localhostProfile:
+                                      type: string
+                                    type:
+                                      type: string
+                                  required:
+                                  - type
+                                  type: object
                                 supplementalGroups:
                                   items:
                                     format: int64
@@ -2094,6 +2156,8 @@ spec:
                               type: string
                             serviceAccountName:
                               type: string
+                            setHostnameAsFQDN:
+                              type: boolean
                             shareProcessNamespace:
                               type: boolean
                             subdomain:
@@ -2156,424 +2220,12 @@ spec:
                                 - whenUnsatisfiable
                                 type: object
                               type: array
+                              x-kubernetes-list-map-keys:
+                              - topologyKey
+                              - whenUnsatisfiable
+                              x-kubernetes-list-type: map
                             volumes:
-                              items:
+                              x-kubernetes-preserve-unknown-fields: true
-                                properties:
-                                  awsElasticBlockStore:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      partition:
-                                        format: int32
-                                        type: integer
-                                      readOnly:
-                                        type: boolean
-                                      volumeID:
-                                        type: string
-                                    required:
-                                    - volumeID
-                                    type: object
-                                  azureDisk:
-                                    properties:
-                                      cachingMode:
-                                        type: string
-                                      diskName:
-                                        type: string
-                                      diskURI:
-                                        type: string
-                                      fsType:
-                                        type: string
-                                      kind:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                    required:
-                                    - diskName
-                                    - diskURI
-                                    type: object
-                                  azureFile:
-                                    properties:
-                                      readOnly:
-                                        type: boolean
-                                      secretName:
-                                        type: string
-                                      shareName:
-                                        type: string
-                                    required:
-                                    - secretName
-                                    - shareName
-                                    type: object
-                                  cephfs:
-                                    properties:
-                                      monitors:
-                                        items:
-                                          type: string
-                                        type: array
-                                      path:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      secretFile:
-                                        type: string
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      user:
-                                        type: string
-                                    required:
-                                    - monitors
-                                    type: object
-                                  cinder:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      volumeID:
-                                        type: string
-                                    required:
-                                    - volumeID
-                                    type: object
-                                  csi:
-                                    properties:
-                                      driver:
-                                        type: string
-                                      fsType:
-                                        type: string
-                                      nodePublishSecretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      readOnly:
-                                        type: boolean
-                                      volumeAttributes:
-                                        additionalProperties:
-                                          type: string
-                                        type: object
-                                    required:
-                                    - driver
-                                    type: object
-                                  emptyDir:
-                                    properties:
-                                      medium:
-                                        type: string
-                                      sizeLimit:
-                                        anyOf:
-                                        - type: integer
-                                        - type: string
-                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                        x-kubernetes-int-or-string: true
-                                    type: object
-                                  fc:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      lun:
-                                        format: int32
-                                        type: integer
-                                      readOnly:
-                                        type: boolean
-                                      targetWWNs:
-                                        items:
-                                          type: string
-                                        type: array
-                                      wwids:
-                                        items:
-                                          type: string
-                                        type: array
-                                    type: object
-                                  flexVolume:
-                                    properties:
-                                      driver:
-                                        type: string
-                                      fsType:
-                                        type: string
-                                      options:
-                                        additionalProperties:
-                                          type: string
-                                        type: object
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                    required:
-                                    - driver
-                                    type: object
-                                  flocker:
-                                    properties:
-                                      datasetName:
-                                        type: string
-                                      datasetUUID:
-                                        type: string
-                                    type: object
-                                  gcePersistentDisk:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      partition:
-                                        format: int32
-                                        type: integer
-                                      pdName:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                    required:
-                                    - pdName
-                                    type: object
-                                  gitRepo:
-                                    properties:
-                                      directory:
-                                        type: string
-                                      repository:
-                                        type: string
-                                      revision:
-                                        type: string
-                                    required:
-                                    - repository
-                                    type: object
-                                  glusterfs:
-                                    properties:
-                                      endpoints:
-                                        type: string
-                                      path:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                    required:
-                                    - endpoints
-                                    - path
-                                    type: object
-                                  hostPath:
-                                    properties:
-                                      path:
-                                        type: string
-                                      type:
-                                        type: string
-                                    required:
-                                    - path
-                                    type: object
-                                  iscsi:
-                                    properties:
-                                      chapAuthDiscovery:
-                                        type: boolean
-                                      chapAuthSession:
-                                        type: boolean
-                                      fsType:
-                                        type: string
-                                      initiatorName:
-                                        type: string
-                                      iqn:
-                                        type: string
-                                      iscsiInterface:
-                                        type: string
-                                      lun:
-                                        format: int32
-                                        type: integer
-                                      portals:
-                                        items:
-                                          type: string
-                                        type: array
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      targetPortal:
-                                        type: string
-                                    required:
-                                    - iqn
-                                    - lun
-                                    - targetPortal
-                                    type: object
-                                  name:
-                                    type: string
-                                  nfs:
-                                    properties:
-                                      path:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      server:
-                                        type: string
-                                    required:
-                                    - path
-                                    - server
-                                    type: object
-                                  persistentVolumeClaim:
-                                    properties:
-                                      claimName:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                    required:
-                                    - claimName
-                                    type: object
-                                  photonPersistentDisk:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      pdID:
-                                        type: string
-                                    required:
-                                    - pdID
-                                    type: object
-                                  portworxVolume:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      volumeID:
-                                        type: string
-                                    required:
-                                    - volumeID
-                                    type: object
-                                  projected:
-                                    properties:
-                                      defaultMode:
-                                        format: int32
-                                        type: integer
-                                      sources:
-                                        items:
-                                          properties:
-                                            serviceAccountToken:
-                                              properties:
-                                                audience:
-                                                  type: string
-                                                expirationSeconds:
-                                                  format: int64
-                                                  type: integer
-                                                path:
-                                                  type: string
-                                              required:
-                                              - path
-                                              type: object
-                                          type: object
-                                        type: array
-                                    required:
-                                    - sources
-                                    type: object
-                                  quobyte:
-                                    properties:
-                                      group:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      registry:
-                                        type: string
-                                      tenant:
-                                        type: string
-                                      user:
-                                        type: string
-                                      volume:
-                                        type: string
-                                    required:
-                                    - registry
-                                    - volume
-                                    type: object
-                                  rbd:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      image:
-                                        type: string
-                                      keyring:
-                                        type: string
-                                      monitors:
-                                        items:
-                                          type: string
-                                        type: array
-                                      pool:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      user:
-                                        type: string
-                                    required:
-                                    - image
-                                    - monitors
-                                    type: object
-                                  scaleIO:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      gateway:
-                                        type: string
-                                      protectionDomain:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      sslEnabled:
-                                        type: boolean
-                                      storageMode:
-                                        type: string
-                                      storagePool:
-                                        type: string
-                                      system:
-                                        type: string
-                                      volumeName:
-                                        type: string
-                                    required:
-                                    - gateway
-                                    - secretRef
-                                    - system
-                                    type: object
-                                  storageos:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      readOnly:
-                                        type: boolean
-                                      secretRef:
-                                        properties:
-                                          name:
-                                            type: string
-                                        type: object
-                                      volumeName:
-                                        type: string
-                                      volumeNamespace:
-                                        type: string
-                                    type: object
-                                  vsphereVolume:
-                                    properties:
-                                      fsType:
-                                        type: string
-                                      storagePolicyID:
-                                        type: string
-                                      storagePolicyName:
-                                        type: string
-                                      volumePath:
-                                        type: string
-                                    required:
-                                    - volumePath
-                                    type: object
-                                required:
-                                - name
-                                type: object
-                              type: array
                           required:
                           - containers
                           type: object
@@ -2680,4 +2332,7 @@ spec:
         required:
         - spec
         type: object
+    served: true
+    storage: true
+    subresources: {}
 {{- end }}

charts/argo-rollouts/templates/crds/rollout-crd.yaml

@@ -3,7 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+    {{- if .Values.crdAnnotations }}
+{{- toYaml .Values.crdAnnotations | nindent 4 }}
+    {{- end }}
   name: rollouts.argoproj.io
 spec:
   group: argoproj.io
@@ -16,32 +19,24 @@ spec:
     singular: rollout
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
-    served: true
+    - description: Number of desired pods
-    storage: true
+      jsonPath: .spec.replicas
-    additionalPrinterColumns:
-    - jsonPath: .spec.replicas
-      description: Number of desired pods
       name: Desired
       type: integer
-    - jsonPath: .status.replicas
+    - description: Total number of non-terminated pods targeted by this rollout
-      description: Total number of non-terminated pods targeted by this rollout
+      jsonPath: .status.replicas
       name: Current
       type: integer
-    - jsonPath: .status.updatedReplicas
+    - description: Total number of non-terminated pods targeted by this rollout that have the desired template spec
-      description: Total number of non-terminated pods targeted by this rollout that have the desired template spec
+      jsonPath: .status.updatedReplicas
       name: Up-to-date
       type: integer
-    - jsonPath: .status.availableReplicas
+    - description: Total number of available pods (ready for at least minReadySeconds) targeted by this rollout
-      description: Total number of available pods (ready for at least minReadySeconds) targeted by this rollout
+      jsonPath: .status.availableReplicas
       name: Available
       type: integer
-    subresources:
+    name: v1alpha1
-      scale:
-        labelSelectorPath: .status.selector
-        specReplicasPath: .spec.replicas
-        statusReplicasPath: .status.HPAReplicas
-      status: {}
     schema:
       openAPIV3Schema:
         properties:
@@ -158,10 +153,6 @@ spec:
                               - name
                               type: object
                             type: array
-                          clusterScope:
-                            type: boolean
-                          templateName:
-                            type: string
                           templates:
                             items:
                               properties:
@@ -197,10 +188,6 @@ spec:
                               - name
                               type: object
                             type: array
-                          clusterScope:
-                            type: boolean
-                          templateName:
-                            type: string
                           templates:
                             items:
                               properties:
@@ -263,13 +250,9 @@ spec:
                               - name
                               type: object
                             type: array
-                          clusterScope:
-                            type: boolean
                           startingStep:
                             format: int32
                             type: integer
-                          templateName:
-                            type: string
                           templates:
                             items:
                               properties:
@@ -357,10 +340,6 @@ spec:
                                     - name
                                     type: object
                                   type: array
-                                clusterScope:
-                                  type: boolean
-                                templateName:
-                                  type: string
                                 templates:
                                   items:
                                     properties:
@@ -1122,11 +1101,16 @@ spec:
                                   name:
                                     type: string
                                   protocol:
+                                    default: TCP
                                     type: string
                                 required:
                                 - containerPort
                                 type: object
                               type: array
+                              x-kubernetes-list-map-keys:
+                              - containerPort
+                              - protocol
+                              x-kubernetes-list-type: map
                             readinessProbe:
                               properties:
                                 exec:
@@ -1193,6 +1177,11 @@ spec:
                                   type: integer
                               type: object
                             resources:
+                              properties:
+                                limits:
+                                  x-kubernetes-preserve-unknown-fields: true
+                                requests:
+                                  x-kubernetes-preserve-unknown-fields: true
                               type: object
                             securityContext:
                               properties:
@@ -1670,6 +1659,7 @@ spec:
                                   name:
                                     type: string
                                   protocol:
+                                    default: TCP
                                     type: string
                                 required:
                                 - containerPort
@@ -1741,6 +1731,11 @@ spec:
                                   type: integer
                               type: object
                             resources:
+                              properties:
+                                limits:
+                                  x-kubernetes-preserve-unknown-fields: true
+                                requests:
+                                  x-kubernetes-preserve-unknown-fields: true
                               type: object
                             securityContext:
                               properties:
@@ -2222,11 +2217,16 @@ spec:
                                   name:
                                     type: string
                                   protocol:
+                                    default: TCP
                                     type: string
                                 required:
                                 - containerPort
                                 type: object
                               type: array
+                              x-kubernetes-list-map-keys:
+                              - containerPort
+                              - protocol
+                              x-kubernetes-list-type: map
                             readinessProbe:
                               properties:
                                 exec:
@@ -2293,6 +2293,11 @@ spec:
                                   type: integer
                               type: object
                             resources:
+                              properties:
+                                limits:
+                                  x-kubernetes-preserve-unknown-fields: true
+                                requests:
+                                  x-kubernetes-preserve-unknown-fields: true
                               type: object
                             securityContext:
                               properties:
@@ -2632,670 +2637,12 @@ spec:
                           - whenUnsatisfiable
                           type: object
                         type: array
+                        x-kubernetes-list-map-keys:
+                        - topologyKey
+                        - whenUnsatisfiable
+                        x-kubernetes-list-type: map
                       volumes:
-                        items:
+                        x-kubernetes-preserve-unknown-fields: true
-                          properties:
-                            awsElasticBlockStore:
-                              properties:
-                                fsType:
-                                  type: string
-                                partition:
-                                  format: int32
-                                  type: integer
-                                readOnly:
-                                  type: boolean
-                                volumeID:
-                                  type: string
-                              required:
-                              - volumeID
-                              type: object
-                            azureDisk:
-                              properties:
-                                cachingMode:
-                                  type: string
-                                diskName:
-                                  type: string
-                                diskURI:
-                                  type: string
-                                fsType:
-                                  type: string
-                                kind:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                              required:
-                              - diskName
-                              - diskURI
-                              type: object
-                            azureFile:
-                              properties:
-                                readOnly:
-                                  type: boolean
-                                secretName:
-                                  type: string
-                                shareName:
-                                  type: string
-                              required:
-                              - secretName
-                              - shareName
-                              type: object
-                            cephfs:
-                              properties:
-                                monitors:
-                                  items:
-                                    type: string
-                                  type: array
-                                path:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                secretFile:
-                                  type: string
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                user:
-                                  type: string
-                              required:
-                              - monitors
-                              type: object
-                            cinder:
-                              properties:
-                                fsType:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                volumeID:
-                                  type: string
-                              required:
-                              - volumeID
-                              type: object
-                            configMap:
-                              properties:
-                                defaultMode:
-                                  format: int32
-                                  type: integer
-                                items:
-                                  items:
-                                    properties:
-                                      key:
-                                        type: string
-                                      mode:
-                                        format: int32
-                                        type: integer
-                                      path:
-                                        type: string
-                                    required:
-                                    - key
-                                    - path
-                                    type: object
-                                  type: array
-                                name:
-                                  type: string
-                                optional:
-                                  type: boolean
-                              type: object
-                            csi:
-                              properties:
-                                driver:
-                                  type: string
-                                fsType:
-                                  type: string
-                                nodePublishSecretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                readOnly:
-                                  type: boolean
-                                volumeAttributes:
-                                  additionalProperties:
-                                    type: string
-                                  type: object
-                              required:
-                              - driver
-                              type: object
-                            downwardAPI:
-                              properties:
-                                defaultMode:
-                                  format: int32
-                                  type: integer
-                                items:
-                                  items:
-                                    properties:
-                                      fieldRef:
-                                        properties:
-                                          apiVersion:
-                                            type: string
-                                          fieldPath:
-                                            type: string
-                                        required:
-                                        - fieldPath
-                                        type: object
-                                      mode:
-                                        format: int32
-                                        type: integer
-                                      path:
-                                        type: string
-                                      resourceFieldRef:
-                                        properties:
-                                          containerName:
-                                            type: string
-                                          divisor:
-                                            type: string
-                                          resource:
-                                            type: string
-                                        required:
-                                        - resource
-                                        type: object
-                                    required:
-                                    - path
-                                    type: object
-                                  type: array
-                              type: object
-                            emptyDir:
-                              properties:
-                                medium:
-                                  type: string
-                                sizeLimit:
-                                  anyOf:
-                                  - type: integer
-                                  - type: string
-                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                  x-kubernetes-int-or-string: true
-                              type: object
-                            ephemeral:
-                              properties:
-                                readOnly:
-                                  type: boolean
-                                volumeClaimTemplate:
-                                  properties:
-                                    metadata:
-                                      type: object
-                                    spec:
-                                      properties:
-                                        accessModes:
-                                          items:
-                                            type: string
-                                          type: array
-                                        dataSource:
-                                          properties:
-                                            apiGroup:
-                                              type: string
-                                            kind:
-                                              type: string
-                                            name:
-                                              type: string
-                                          required:
-                                          - kind
-                                          - name
-                                          type: object
-                                        resources:
-                                          properties:
-                                            limits:
-                                              additionalProperties:
-                                                anyOf:
-                                                - type: integer
-                                                - type: string
-                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                x-kubernetes-int-or-string: true
-                                              type: object
-                                            requests:
-                                              additionalProperties:
-                                                anyOf:
-                                                - type: integer
-                                                - type: string
-                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                x-kubernetes-int-or-string: true
-                                              type: object
-                                          type: object
-                                        selector:
-                                          properties:
-                                            matchExpressions:
-                                              items:
-                                                properties:
-                                                  key:
-                                                    type: string
-                                                  operator:
-                                                    type: string
-                                                  values:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                required:
-                                                - key
-                                                - operator
-                                                type: object
-                                              type: array
-                                            matchLabels:
-                                              additionalProperties:
-                                                type: string
-                                              type: object
-                                          type: object
-                                        storageClassName:
-                                          type: string
-                                        volumeMode:
-                                          type: string
-                                        volumeName:
-                                          type: string
-                                      type: object
-                                  required:
-                                  - spec
-                                  type: object
-                              type: object
-                            fc:
-                              properties:
-                                fsType:
-                                  type: string
-                                lun:
-                                  format: int32
-                                  type: integer
-                                readOnly:
-                                  type: boolean
-                                targetWWNs:
-                                  items:
-                                    type: string
-                                  type: array
-                                wwids:
-                                  items:
-                                    type: string
-                                  type: array
-                              type: object
-                            flexVolume:
-                              properties:
-                                driver:
-                                  type: string
-                                fsType:
-                                  type: string
-                                options:
-                                  additionalProperties:
-                                    type: string
-                                  type: object
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                              required:
-                              - driver
-                              type: object
-                            flocker:
-                              properties:
-                                datasetName:
-                                  type: string
-                                datasetUUID:
-                                  type: string
-                              type: object
-                            gcePersistentDisk:
-                              properties:
-                                fsType:
-                                  type: string
-                                partition:
-                                  format: int32
-                                  type: integer
-                                pdName:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                              required:
-                              - pdName
-                              type: object
-                            gitRepo:
-                              properties:
-                                directory:
-                                  type: string
-                                repository:
-                                  type: string
-                                revision:
-                                  type: string
-                              required:
-                              - repository
-                              type: object
-                            glusterfs:
-                              properties:
-                                endpoints:
-                                  type: string
-                                path:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                              required:
-                              - endpoints
-                              - path
-                              type: object
-                            hostPath:
-                              properties:
-                                path:
-                                  type: string
-                                type:
-                                  type: string
-                              required:
-                              - path
-                              type: object
-                            iscsi:
-                              properties:
-                                chapAuthDiscovery:
-                                  type: boolean
-                                chapAuthSession:
-                                  type: boolean
-                                fsType:
-                                  type: string
-                                initiatorName:
-                                  type: string
-                                iqn:
-                                  type: string
-                                iscsiInterface:
-                                  type: string
-                                lun:
-                                  format: int32
-                                  type: integer
-                                portals:
-                                  items:
-                                    type: string
-                                  type: array
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                targetPortal:
-                                  type: string
-                              required:
-                              - iqn
-                              - lun
-                              - targetPortal
-                              type: object
-                            name:
-                              type: string
-                            nfs:
-                              properties:
-                                path:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                server:
-                                  type: string
-                              required:
-                              - path
-                              - server
-                              type: object
-                            persistentVolumeClaim:
-                              properties:
-                                claimName:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                              required:
-                              - claimName
-                              type: object
-                            photonPersistentDisk:
-                              properties:
-                                fsType:
-                                  type: string
-                                pdID:
-                                  type: string
-                              required:
-                              - pdID
-                              type: object
-                            portworxVolume:
-                              properties:
-                                fsType:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                volumeID:
-                                  type: string
-                              required:
-                              - volumeID
-                              type: object
-                            projected:
-                              properties:
-                                defaultMode:
-                                  format: int32
-                                  type: integer
-                                sources:
-                                  items:
-                                    properties:
-                                      configMap:
-                                        properties:
-                                          items:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                mode:
-                                                  format: int32
-                                                  type: integer
-                                                path:
-                                                  type: string
-                                              required:
-                                              - key
-                                              - path
-                                              type: object
-                                            type: array
-                                          name:
-                                            type: string
-                                          optional:
-                                            type: boolean
-                                        type: object
-                                      downwardAPI:
-                                        properties:
-                                          items:
-                                            items:
-                                              properties:
-                                                fieldRef:
-                                                  properties:
-                                                    apiVersion:
-                                                      type: string
-                                                    fieldPath:
-                                                      type: string
-                                                  required:
-                                                  - fieldPath
-                                                  type: object
-                                                mode:
-                                                  format: int32
-                                                  type: integer
-                                                path:
-                                                  type: string
-                                                resourceFieldRef:
-                                                  properties:
-                                                    containerName:
-                                                      type: string
-                                                    divisor:
-                                                      type: string
-                                                    resource:
-                                                      type: string
-                                                  required:
-                                                  - resource
-                                                  type: object
-                                              required:
-                                              - path
-                                              type: object
-                                            type: array
-                                        type: object
-                                      secret:
-                                        properties:
-                                          items:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                mode:
-                                                  format: int32
-                                                  type: integer
-                                                path:
-                                                  type: string
-                                              required:
-                                              - key
-                                              - path
-                                              type: object
-                                            type: array
-                                          name:
-                                            type: string
-                                          optional:
-                                            type: boolean
-                                        type: object
-                                      serviceAccountToken:
-                                        properties:
-                                          audience:
-                                            type: string
-                                          expirationSeconds:
-                                            format: int64
-                                            type: integer
-                                          path:
-                                            type: string
-                                        required:
-                                        - path
-                                        type: object
-                                    type: object
-                                  type: array
-                              required:
-                              - sources
-                              type: object
-                            quobyte:
-                              properties:
-                                group:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                registry:
-                                  type: string
-                                tenant:
-                                  type: string
-                                user:
-                                  type: string
-                                volume:
-                                  type: string
-                              required:
-                              - registry
-                              - volume
-                              type: object
-                            rbd:
-                              properties:
-                                fsType:
-                                  type: string
-                                image:
-                                  type: string
-                                keyring:
-                                  type: string
-                                monitors:
-                                  items:
-                                    type: string
-                                  type: array
-                                pool:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                user:
-                                  type: string
-                              required:
-                              - image
-                              - monitors
-                              type: object
-                            scaleIO:
-                              properties:
-                                fsType:
-                                  type: string
-                                gateway:
-                                  type: string
-                                protectionDomain:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                sslEnabled:
-                                  type: boolean
-                                storageMode:
-                                  type: string
-                                storagePool:
-                                  type: string
-                                system:
-                                  type: string
-                                volumeName:
-                                  type: string
-                              required:
-                              - gateway
-                              - secretRef
-                              - system
-                              type: object
-                            secret:
-                              properties:
-                                defaultMode:
-                                  format: int32
-                                  type: integer
-                                items:
-                                  items:
-                                    properties:
-                                      key:
-                                        type: string
-                                      mode:
-                                        format: int32
-                                        type: integer
-                                      path:
-                                        type: string
-                                    required:
-                                    - key
-                                    - path
-                                    type: object
-                                  type: array
-                                optional:
-                                  type: boolean
-                                secretName:
-                                  type: string
-                              type: object
-                            storageos:
-                              properties:
-                                fsType:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                secretRef:
-                                  properties:
-                                    name:
-                                      type: string
-                                  type: object
-                                volumeName:
-                                  type: string
-                                volumeNamespace:
-                                  type: string
-                              type: object
-                            vsphereVolume:
-                              properties:
-                                fsType:
-                                  type: string
-                                storagePolicyID:
-                                  type: string
-                                storagePolicyName:
-                                  type: string
-                                volumePath:
-                                  type: string
-                              required:
-                              - volumePath
-                              type: object
-                          required:
-                          - name
-                          type: object
-                        type: array
                     required:
                     - containers
                     type: object
@@ -3321,8 +2668,6 @@ spec:
                 properties:
                   activeSelector:
                     type: string
-                  postPromotionAnalysisRun:
-                    type: string
                   postPromotionAnalysisRunStatus:
                     properties:
                       message:
@@ -3335,8 +2680,6 @@ spec:
                     - name
                     - status
                     type: object
-                  prePromotionAnalysisRun:
-                    type: string
                   prePromotionAnalysisRunStatus:
                     properties:
                       message:
@@ -3351,18 +2694,11 @@ spec:
                     type: object
                   previewSelector:
                     type: string
-                  previousActiveSelector:
-                    type: string
-                  scaleDownDelayStartTime:
-                    format: date-time
-                    type: string
                   scaleUpPreviewCheckPoint:
                     type: boolean
                 type: object
               canary:
                 properties:
-                  currentBackgroundAnalysisRun:
-                    type: string
                   currentBackgroundAnalysisRunStatus:
                     properties:
                       message:
@@ -3377,8 +2713,6 @@ spec:
                     type: object
                   currentExperiment:
                     type: string
-                  currentStepAnalysisRun:
-                    type: string
                   currentStepAnalysisRunStatus:
                     properties:
                       message:
@@ -3467,4 +2801,12 @@ spec:
         required:
         - spec
         type: object
+    served: true
+    storage: true
+    subresources:
+      scale:
+        labelSelectorPath: .status.selector
+        specReplicasPath: .spec.replicas
+        statusReplicasPath: .status.HPAReplicas
+      status: {}
 {{- end }}

charts/argo-rollouts/values.yaml

@@ -30,10 +30,13 @@ controller:
       additionalLabels: {}
       additionalAnnotations: {}
 
-
 serviceAccount:
   name: argo-rollouts
 
+## Annotations to be added to all CRDs
+##
+crdAnnotations: {}
+
 ## Annotations to be added to the Rollout pods
 ##
 podAnnotations: {}

charts/argo/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.12.5
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.16.8
+version: 0.16.10
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:

charts/argo/templates/NOTES.txt

@@ -11,6 +11,6 @@ argo submit https://raw.githubusercontent.com/argoproj/argo/master/examples/hell
 3. Access Minio UI and create bucket '{{ .Values.minio.defaultBucket.name }}'. Minio UI is available on port 9000 and available via external URL. URL might be retrieved using following
 command:
 
-kubectl --namespace {{ .Release.Namespace }} get services -o wide | grep {{ .Release.Name }}-minio-svc
+kubectl --namespace {{ .Release.Namespace }} get services -o wide | grep {{ .Release.Name }}-minio
 
 {{ end }}

charts/argo/values.yaml

@@ -136,7 +136,7 @@ controller:
   # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
   # PriorityClass: system-cluster-critical
   priorityClassName: ""
-  # https://argoproj.github.io/argo/links/
+  # https://argoproj.github.io/argo-workflows/links/
   links: []
 
 # executor controls how the init and wait container should be customized
@@ -206,7 +206,7 @@ server:
   # Run the argo server in "secure" mode. Configure this value instead of
   # "--secure" in extraArgs. See the following documentation for more details
   # on secure mode:
-  # https://argoproj.github.io/argo/tls/#encrypted
+  # https://argoproj.github.io/argo-workflows/tls/#encrypted
   secure: false
 
   # Extra arguments to provide to the Argo server binary.

charts/argocd-applicationset/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: argocd-applicationset
 description: A Helm chart for installing ArgoCD ApplicationSet
 type: application
-version: 0.1.0
+version: 0.1.3
-appVersion: "v0.1.0-prerelease"
+appVersion: "v0.1.0"
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argocd-applicationset/README.md

@@ -18,7 +18,7 @@ To install the chart with the release name `my-release`:
 $ helm repo add argo https://argoproj.github.io/argo-helm
 "argo" has been added to your repositories
 
-$ helm install --name my-release argo/argo-applicationset
+$ helm install --name my-release argo/argocd-applicationset
 NAME: my-release
 ...
 ```
@@ -27,6 +27,17 @@ NAME: my-release
 
 Users of Helm v3 should set the `installCRDs` value to `false` to avoid warnings about nonexistent webhooks.
 
+### Testing
+
+Users can test the chart with [kind](https://kind.sigs.k8s.io/) and [ct](https://github.com/helm/chart-testing).
+
+```console
+kind create cluster
+kubectl create namespace argocd
+kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml
+ct install --namespace argocd
+```
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -46,7 +57,11 @@ Users of Helm v3 should set the `installCRDs` value to `false` to avoid warnings
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository. |
 | installCRDs | bool | `true` | Install Custom Resource Definition |
-| nameOverride | string | `""` | Provide a name in place of `argo-applicationset` |
+| mountSSHKnownHostsVolume | bool | `true` | Mount the `argocd-ssh-known-hosts-cm` volume |
+| mountTLSCertsVolume | bool | `true` | Mount the `argocd-tls-certs-cm` volume |
+| mountGPGKeysVolume | bool | `false` | Mount the `argocd-gpg-keys-cm` volume |
+| mountGPGKeyringVolume | bool | `true` | Mount an emptyDir volume for `gpg-keyring` |
+| nameOverride | string | `""` | Provide a name in place of `argocd-applicationset` |
 | nodeSelector | object | `{}` | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) |
 | podAnnotations | object | `{}` | Annotations for the controller pods |
 | podSecurityContext | object | `{}` | Pod Security Context |

charts/argocd-applicationset/ci/default-values.yaml

@@ -0,0 +1,77 @@
+# Default values for argo-applicationset.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+installCRDs: false # this needs to be false with ct
+
+image:
+  # The image repository
+  repository: quay.io/argocdapplicationset/argocd-applicationset
+  # Image pull policy
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+args:
+  metricsAddr: :8080
+  probeBindAddr: :8081
+  enableLeaderElection: false
+  namespace: argocd
+  argocdRepoServer: argocd-repo-server:8081
+  policy: sync
+  debug: false
+  dryRun: false
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+rbac:
+  pspEnabled: true
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+mountSSHKnownHostsVolume: true
+mountTLSCertsVolume: true
+mountGPGKeysVolume: false
+mountGPGKeyringVolume: true

charts/argocd-applicationset/ci/leader-election-values.yaml

@@ -0,0 +1,6 @@
+args:
+  enableLeaderElection: true
+
+replicaCount: 3
+
+installCRDs: false

charts/argocd-applicationset/templates/deployment.yaml

@@ -49,6 +49,43 @@ spec:
               protocol: TCP
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            {{- if .Values.mountSSHKnownHostsVolume }}
+            - mountPath: /app/config/ssh
+              name: ssh-known-hosts
+            {{- end }}
+            {{- if .Values.mountTLSCertsVolume }}
+            - mountPath: /app/config/tls
+              name: tls-certs
+            {{- end }}
+            {{- if .Values.mountGPGKeysVolume }}
+            - mountPath: /app/config/gpg/source
+              name: gpg-keys
+            {{- end }}
+            {{- if .Values.mountGPGKeyringVolume }}
+            - mountPath: /app/config/gpg/keys
+              name: gpg-keyring
+            {{- end }}
+      volumes:
+      {{- if .Values.mountSSHKnownHostsVolume }}
+      - configMap:
+          name: argocd-ssh-known-hosts-cm
+        name: ssh-known-hosts
+      {{- end }}
+      {{- if .Values.mountTLSCertsVolume }}
+      - configMap:
+          name: argocd-tls-certs-cm
+        name: tls-certs
+      {{- end }}
+      {{- if .Values.mountGPGKeysVolume }}
+      - configMap:
+          name: argocd-gpg-keys-cm
+        name: gpg-keys
+      {{- end }}
+      {{- if .Values.mountGPGKeyringVolume }}
+      - emptyDir: {}
+        name: gpg-keyring
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/argocd-applicationset/templates/rbac.yaml

@@ -9,6 +9,7 @@ rules:
     - argoproj.io
     resources:
     - applications
+    - appprojects
     - applicationsets
     - applicationsets/finalizers
     verbs:
@@ -28,7 +29,7 @@ rules:
     - patch
     - update
   - apiGroups:
-      - ''
+    - ""
     resources:
     - events
     verbs:
@@ -40,7 +41,7 @@ rules:
     - update
     - watch
   - apiGroups:
-      - ''
+    - ""
     resources:
     - secrets
     verbs:
@@ -48,31 +49,38 @@ rules:
     - list
     - watch
   - apiGroups:
-    - ''
+    - ""
     resources:
     - configmaps
     verbs:
+    - create
+    - delete
+    - get
+    - list
+    - patch
+    - update
+    - watch
+  - apiGroups:
+    - apps
+    - extensions
+    resources:
+    - deployments
+    verbs:
     - get
     - list
     - watch
+  - apiGroups:
+    - coordination.k8s.io
+    resources:
+    - leases
+    verbs:
     - create
-    - update
-    - patch
     - delete
-  - apiGroups:
-    - ''
-    resources:
-    - configmaps/status
-    verbs:
     - get
-    - update
+    - list
     - patch
-  - apiGroups:
+    - update
-    - ''
+    - watch
-    resources:
-    - events
-    verbs:
-    - create
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding

charts/argocd-applicationset/values.yaml

@@ -70,3 +70,8 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+mountSSHKnownHostsVolume: true
+mountTLSCertsVolume: true
+mountGPGKeysVolume: false
+mountGPGKeyringVolume: true

charts/argocd-notifications/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 1.0.2
+appVersion: 1.1.1
 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
 name: argocd-notifications
 type: application
-version: 1.0.15
+version: 1.2.0
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argocd-notifications/templates/bots/slack/role.yaml

@@ -4,6 +4,15 @@ kind: Role
 metadata:
   name: {{ include "argocd-notifications.name" . }}-bot
 rules:
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - argoproj.io
   resources:
@@ -15,13 +24,4 @@ rules:
   - watch
   - update
   - patch
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  - configmaps
-  verbs:
-  - get
-  - list
-  - watch
 {{ end }}

charts/argocd-notifications/templates/configmap.yaml

@@ -1,3 +1,4 @@
+{{ if .Values.cm.create }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -20,3 +21,4 @@ data:
   {{- with .Values.triggers }}
     {{- toYaml . | nindent 2 }}
   {{- end }}
+{{- end }}

charts/argocd-notifications/templates/deployment.yaml

@@ -26,8 +26,9 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       serviceAccountName: {{ include "argocd-notifications.serviceAccountName" . }}
-      securityContext:
+      {{- if .Values.securityContext }}
-        runAsNonRoot: true
+      securityContext: {{- toYaml .Values.securityContext | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ include "argocd-notifications.name" . }}-controller
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -51,6 +52,9 @@ spec:
             name: metrics
             protocol: TCP
           {{- end }}
+          {{- if .Values.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.containerSecurityContext | nindent 12 }}
+          {{- end }}
           {{- with .Values.extraEnv }}
           env: {{ toYaml . | nindent 12 }}
           {{- end }}

charts/argocd-notifications/templates/role.yaml

@@ -19,9 +19,24 @@ rules:
 - apiGroups:
   - ""
   resources:
+  - configmaps
   - secrets
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resourceNames:
+  - {{ include "argocd-notifications.name" . }}-cm
+  resources:
   - configmaps
   verbs:
   - get
-  - list
+- apiGroups:
-  - watch
+  - ""
+  resourceNames:
+  - {{ include "argocd-notifications.name" . }}-secret
+  resources:
+  - secrets
+  verbs:
+  - get

charts/argocd-notifications/values.yaml

@@ -7,7 +7,7 @@ fullnameOverride: ""
 
 image:
   repository: argoprojlabs/argocd-notifications
-  tag: v1.0.2
+  tag: v1.1.1
   pullPolicy: IfNotPresent
 
 imagePullSecrets: []
@@ -65,6 +65,13 @@ notifiers:
 
 podAnnotations: {}
 
+## Pod Security Context
+securityContext:
+  runAsNonRoot: true
+
+## Container Security Context
+containerSecurityContext: {}
+
 resources: {}
   # limits:
   #   cpu: 100m
@@ -81,6 +88,10 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: argocd-notifications-controller
 
+cm:
+  # Whether helm chart creates controller config map
+  create: true
+
 subscriptions:
   # For more information: https://argocd-notifications.readthedocs.io/en/stable/subscriptions/
 
@@ -337,7 +348,7 @@ bots:
 
     image:
       repository: argoprojlabs/argocd-notifications
-      tag: v1.0.1
+      tag: v1.1.1
       pullPolicy: IfNotPresent
 
     imagePullSecrets: []