Merge branch 'master' into rollouts_resources

charts/argo-cd/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "1.5.4"
+appVersion: "1.6.1"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.3.6
+version: 2.4.0
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argo-cd/README.md

@@ -62,7 +62,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 |-----|------|---------|
 | global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` |
 | global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` |
-| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.5.3"` |
+| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.6.1"` |
 | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |
 | global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` |
 | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` |
@@ -120,6 +120,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | controller.service.annotations | Controller service annotations. | `{}` |
 | controller.service.labels | Controller service labels. | `{}` |
 | controller.service.port | Controller service port. | `8082` |
+| controler.serviceAccount.annotations | Controller service account annotations | `{}` |
 | controller.serviceAccount.create | Create a service account for the controller | `true` |
 | controller.serviceAccount.name | Service account name. | `"argocd-application-controller"` |
 | controller.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
@@ -169,6 +170,9 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | repoServer.service.annotations | Repo server service annotations. | `{}` |
 | repoServer.service.labels | Repo server service labels. | `{}` |
 | repoServer.service.port | Repo server service port. | `8081` |
+| repoServer.serviceAccount.annotations | Repo server service account annotations | `{}` |
+| repoServer.serviceAccount.create | Create repo server service account | `false` |
+| repoServer.serviceAccount.name | Repo server service account name | `"argocd-repo-server"` |
 | repoServer.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
 | repoServer.volumeMounts | Repo server volume mounts | `[]` |
 | repoServer.volumes | Repo server volumes | `[]` |
@@ -237,6 +241,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | server.service.servicePortHttpsName | Server service https port name, can be used to route traffic via istio | `https` |
 | server.service.loadBalancerSourceRanges | Source IP ranges to allow access to service from. | `[]` |
 | server.service.type | Server service type | `"ClusterIP"` |
+| server.serviceAccount.annotations | Server service account annotations | `{}` |
 | server.serviceAccount.create | Create server service account | `true` |
 | server.serviceAccount.name | Server service account name | `"argocd-server"` |
 | server.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
@@ -287,7 +292,7 @@ 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.3"` |
+| redis.image.tag | Redis tag | `"5.0.8"` |
 | 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/) | `{}` |
@@ -306,3 +311,4 @@ 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"` |

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

@@ -37,6 +37,18 @@ spec:
         operation:
           description: Operation contains requested operation parameters.
           properties:
+            info:
+              items:
+                properties:
+                  name:
+                    type: string
+                  value:
+                    type: string
+                required:
+                - name
+                - value
+                type: object
+              type: array
             initiatedBy:
               description: OperationInitiator holds information about the operation
                 initiator
@@ -574,7 +586,7 @@ spec:
                       type: boolean
                   type: object
                 syncOptions:
-                  description: Options allow youe to specify whole app sync-options
+                  description: Options allow you to specify whole app sync-options
                   items:
                     type: string
                   type: array
@@ -615,6 +627,7 @@ spec:
                 message:
                   type: string
                 status:
+                  description: Represents resource health status
                   type: string
               type: object
             history:
@@ -848,6 +861,18 @@ spec:
                 operation:
                   description: Operation is the original requested operation
                   properties:
+                    info:
+                      items:
+                        properties:
+                          name:
+                            type: string
+                          value:
+                            type: string
+                        required:
+                        - name
+                        - value
+                        type: object
+                      type: array
                     initiatedBy:
                       description: OperationInitiator holds information about the
                         operation initiator
@@ -1413,6 +1438,7 @@ spec:
                       message:
                         type: string
                       status:
+                        description: Represents resource health status
                         type: string
                     type: object
                   hook:

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

@@ -3,6 +3,12 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "argo-cd.controllerServiceAccountName" . }}
+{{- if .Values.controller.serviceAccount.annotations }}
+  annotations:
+  {{- range $key, $value := .Values.controller.serviceAccount.annotations }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
+{{- end }}
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}

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

@@ -3,6 +3,12 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "argo-cd.serverServiceAccountName" . }}
+{{- if .Values.server.serviceAccount.annotations }}
+  annotations:
+  {{- range $key, $value := .Values.server.serviceAccount.annotations }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
+{{- end }}
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}

charts/argo-cd/values.yaml

@@ -10,7 +10,7 @@ installCRDs: true
 global:
   image:
     repository: argoproj/argocd
-    tag: v1.5.4
+    tag: v1.6.1
     imagePullPolicy: IfNotPresent
   securityContext: {}
   #  runAsUser: 999
@@ -28,7 +28,7 @@ controller:
 
   image:
     repository: # argoproj/argocd
-    tag: # v1.5.4
+    tag: # v1.6.1
     imagePullPolicy: # IfNotPresent
 
   ## Argo controller commandline flags
@@ -113,6 +113,8 @@ controller:
   serviceAccount:
     create: true
     name: argocd-application-controller
+    ## Annotations applied to created service account
+    annotations: {}
 
   ## Server metrics controller configuration
   metrics:
@@ -241,7 +243,7 @@ redis:
 
   image:
     repository: redis
-    tag: 5.0.3
+    tag: 5.0.8
     imagePullPolicy: IfNotPresent
 
   containerPort: 6379
@@ -303,6 +305,8 @@ redis-ha:
     enabled: true
     metrics:
       enabled: true
+  image:
+    tag: 5.0.8-alpine
 
 ## Server
 server:
@@ -319,7 +323,7 @@ server:
 
   image:
     repository: # argoproj/argocd
-    tag: # v1.5.4
+    tag: # v1.6.1
     imagePullPolicy: # IfNotPresent
 
   ## Additional command line arguments to pass to argocd-server
@@ -426,6 +430,8 @@ server:
   serviceAccount:
     create: true
     name: argocd-server
+    ## Annotations applied to created service account
+    annotations: {}
 
   ingress:
     enabled: false
@@ -593,7 +599,7 @@ repoServer:
 
   image:
     repository: # argoproj/argocd
-    tag: # v1.5.4
+    tag: # v1.6.1
     imagePullPolicy: # IfNotPresent
 
   ## Additional command line arguments to pass to argocd-repo-server

charts/argocd-notifications/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: 0.7.0
 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
 name: argocd-notifications
 type: application
-version: 1.0.3
+version: 1.0.4
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argocd-notifications/templates/_helpers.tpl

@@ -43,6 +43,18 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
 
+{{/*
+Common slack bot labels
+*/}}
+{{- define "argocd-notifications.bots.slack.labels" -}}
+helm.sh/chart: {{ include "argocd-notifications.chart" . }}
+{{ include "argocd-notifications.bots.slack.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
 {{/*
 Selector labels
 */}}
@@ -51,6 +63,14 @@ app.kubernetes.io/name: {{ include "argocd-notifications.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
+{{/*
+Selector slack bot labels
+*/}}
+{{- define "argocd-notifications.bots.slack.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "argocd-notifications.name" . }}-bot
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
 {{/*
 Create the name of the service account to use
 */}}
@@ -61,3 +81,14 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Create the name of the bot service account to use
+*/}}
+{{- define "argocd-notifications.bots.slack.serviceAccountName" -}}
+{{- if .Values.bots.slack.serviceAccount.create -}}
+    {{ default (include "argocd-notifications.fullname" .) .Values.bots.slack.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.bots.slack.serviceAccount.name }}
+{{- end -}}
+{{- end -}}

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

@@ -0,0 +1,45 @@
+{{ if .Values.bots.slack.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "argocd-notifications.name" . }}-bot
+  labels:
+    {{- include "argocd-notifications.bots.slack.labels" . | nindent 4 }}
+spec:
+  strategy:
+    {{- .Values.bots.slack.updateStrategy | toYaml | nindent 4 }}
+  selector:
+    matchLabels:
+      {{- include "argocd-notifications.bots.slack.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "argocd-notifications.bots.slack.selectorLabels" . | nindent 8 }}
+    spec:
+    {{- with .Values.bots.slack.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      serviceAccountName: {{ include "argocd-notifications.serviceAccountName" . }}-bot
+      containers:
+        - name: {{ include "argocd-notifications.name" . }}-bot
+          image: "{{ .Values.bots.slack.image.repository }}:{{ .Values.bots.slack.image.tag }}"
+          imagePullPolicy: {{ .Values.bots.slack.image.pullPolicy }}
+          resources:
+            {{- toYaml .Values.bots.slack.resources | nindent 12 }}
+          command:
+            - /app/argocd-notifications
+            - bot
+      {{- with .Values.bots.slack.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    {{- with .Values.bots.slack.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.bots.slack.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+{{ end }}

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

@@ -0,0 +1,18 @@
+{{ if .Values.bots.slack.enabled }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "argocd-notifications.name" . }}-bot
+rules:
+- apiGroups:
+  - argoproj.io
+  resources:
+  - applications
+  - appprojects
+  verbs:
+  - get
+  - list
+  - watch
+  - update
+  - patch
+{{ end }}

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

@@ -0,0 +1,13 @@
+{{ if .Values.bots.slack.enabled }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "argocd-notifications.name" . }}-bot
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "argocd-notifications.name" . }}-bot
+subjects:
+- kind: ServiceAccount
+  name: {{ include "argocd-notifications.bots.slack.serviceAccountName" . }}
+{{ end }}

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

@@ -0,0 +1,15 @@
+{{ if .Values.bots.slack.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "argocd-notifications.name" . }}-bot
+spec:
+  ports:
+  - name: server
+    port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    {{- include "argocd-notifications.bots.slack.selectorLabels" . | nindent 4 }}
+  type: {{ .Values.bots.slack.service.type }}
+{{ end }}

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

@@ -0,0 +1,8 @@
+{{ if and .Values.bots.slack.enabled .Values.secret.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "argocd-notifications.bots.slack.serviceAccountName" . }}
+  labels:
+    {{- include "argocd-notifications.bots.slack.labels" . | nindent 4 }}
+{{ end }}

charts/argocd-notifications/templates/secret.yaml

@@ -12,6 +12,13 @@ stringData:
     slack:
       token: {{ .Values.secret.notifiers.slack.token }}
       username: {{ .Values.secret.notifiers.slack.username }}
+      icon: {{ .Values.secret.notifiers.slack.icon }}
+      signingSecret: {{ .Values.secret.notifiers.slack.signingSecret }}
+{{- end }}
+{{- if .Values.secret.notifiers.grafana.enabled }}
+    grafana:
+      apiUrl: {{ .Values.secret.notifiers.grafana.apiUrl }}
+      apiKey: {{ .Values.secret.notifiers.grafana.apiKey }}
 {{- end }}
 {{- if .Values.secret.notifiers.webhooks }}
     webhook:

charts/argocd-notifications/values.yaml

@@ -35,6 +35,20 @@ secret:
       token:
       # Optional override username
       username:
+      # Optional override icon
+      icon:
+      # Optional override signingSecret: https://argoproj-labs.github.io/argocd-notifications/recipients/slack-bot/
+      signingSecret:
+
+    grafana:
+      # For more information: https://argoproj-labs.github.io/argocd-notifications/services/grafana/
+
+      # Specifies whether Grafana notifier should be configured
+      enabled: false
+      # Grafana api endpoint; for example: https://grafana.example.com/api
+      apiUrl:
+      # Grafana api key
+      apiKey:
 
     webhooks: {}
       # For more information: https://argoproj-labs.github.io/argocd-notifications/services/webhook/
@@ -144,3 +158,44 @@ triggers:
   #   template: my-custom-template
   #
   # For more information: https://argoproj-labs.github.io/argocd-notifications/triggers_and_templates/
+
+bots:
+  # For more information: https://argoproj-labs.github.io/argocd-notifications/recipients/bot/
+  slack:
+    # You have to set secret.notifiers.slack.signingSecret
+    enabled: false
+
+    updateStrategy:
+      type: Recreate
+
+    image:
+      repository: argoprojlabs/argocd-notifications
+      tag: v0.7.0
+      pullPolicy: IfNotPresent
+
+    imagePullSecrets: []
+
+    service:
+      type: LoadBalancer
+
+    serviceAccount:
+      # Specifies whether a service account should be created
+      create: true
+
+      # The name of the service account to use.
+      # If not set and create is true, a name is generated using the fullname template
+      name: argocd-notifications-bot
+
+    resources: {}
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
+    affinity: {}
+
+    tolerations: []
+
+    nodeSelector: {}