Merge remote-tracking branch 'argoproj/master'

2020-04-27 20:40:27 +01:00 · 2020-04-27 20:40:27 +01:00 · dbaa97d572
commit dbaa97d572
parent 221a7d2e46 c2d9c81258
17 changed files with 185 additions and 15 deletions
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.5.2"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.2.7
+version: 2.2.9
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@ -183,6 +183,8 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | server.autoscaling.maxReplicas | Maximum number of replicas for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `5` |
 | server.autoscaling.targetCPUUtilizationPercentage | Average CPU utilization percentage for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `50` |
 | server.autoscaling.targetMemoryUtilizationPercentage | Average memory utilization percentage for the server [HPA](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) | `50` |
+| server.GKEbackendConfig.enabled | Enable BackendConfig custom resource for Google Kubernetes Engine. | `false` |
+| server.GKEbackendConfig.spec | [BackendConfigSpec](https://cloud.google.com/kubernetes-engine/docs/concepts/backendconfig#backendconfigspec_v1beta1_cloudgooglecom) | `{}` |
 | server.certificate.additionalHosts | Certificate manager additional hosts | `[]` |
 | server.certificate.domain | Certificate manager domain | `"argocd.example.com"` |
 | server.certificate.enabled | Enables a certificate manager certificate. | `false` |
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@ -53,6 +53,9 @@ spec:
        imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
        command:
        - argocd-repo-server
+        {{- if .Values.openshift.enabled }}
+        - uid_entrypoint.sh
+        {{- end }}
        {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
        - --redis
        - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
@ -65,10 +68,16 @@ spec:
        {{- if .Values.repoServer.containerSecurityContext }}
        securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}
        {{- end }}
-        {{- if .Values.repoServer.env }}
+{{- if or (.Values.repoServer.env) (.Values.openshift.enabled) }}
        env:
+{{- if .Values.repoServer.env }}
 {{- toYaml .Values.repoServer.env | nindent 8 }}
-        {{- end }}
+{{- end }}
+{{- if .Values.openshift.enabled }}
+        - name: USER_NAME
+          value: argocd
+{{- end }}
+{{- end }}
        volumeMounts:
        {{- if .Values.repoServer.volumeMounts }}
 {{- toYaml .Values.repoServer.volumeMounts | nindent 8}}
--- a/charts/argo-cd/templates/argocd-server/backendconfig.yaml
+++ b/charts/argo-cd/templates/argocd-server/backendconfig.yaml
@ -0,0 +1,15 @@
+{{- if .Values.server.GKEbackendConfig.enabled }}
+apiVersion: cloud.google.com/v1beta1
+kind: BackendConfig
+metadata:
+  name: {{ template "argo-cd.server.fullname" . }}
+  labels:
+    app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
+    helm.sh/chart: {{ include "argo-cd.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: argocd
+    app.kubernetes.io/component: {{ .Values.server.name }}
+spec:
+  {{- toYaml .Values.server.GKEbackendConfig.spec | nindent 2 }}
+{{- end }}
--- a/charts/argo-cd/templates/argocd-server/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress.yaml
@ -2,7 +2,11 @@
 {{- $serviceName := include "argo-cd.server.fullname" . -}}
 {{- $servicePort := .Values.server.service.servicePortHttp -}}
 {{- $paths := .Values.server.ingress.paths -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: networking.k8s.io/v1beta1
+{{ else }}
 apiVersion: extensions/v1beta1
+{{ end -}}
 kind: Ingress
 metadata:
 {{- if .Values.server.ingress.annotations }}
--- a/charts/argo-cd/templates/argocd-server/route.yaml
+++ b/charts/argo-cd/templates/argocd-server/route.yaml
@ -23,7 +23,9 @@ spec:
  port:
    targetPort: https
  tls:
-    termination: passthrough
-    insecureEdgeTerminationPolicy: None
+    termination: {{ .Values.server.route.termination_type | default "passthrough" }}
+    insecureEdgeTerminationPolicy: {{ .Values.server.route.termination_policy | default "None" }} 
  wildcardPolicy: None
+status:
+  ingress: []
 {{- end }}
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@ -171,7 +171,7 @@ dex:

  image:
    repository: quay.io/dexidp/dex
-    tag: v2.14.0
+    tag: v2.22.0
    imagePullPolicy: IfNotPresent
  initImage:
    repository:
@ -561,6 +561,16 @@ server:
  clusterAdminAccess:
    enabled: true

+  ## Enable BackendConfig custom resource for Google Kubernetes Engine
+  GKEbackendConfig:
+    enabled: false
+    spec: {}
+  #  spec:
+  #    iap:
+  #      enabled: true
+  #      oauthclientCredentials:
+  #        secretName: argocd-secret
+
 ## Repo Server
 repoServer:
  name: repo-server
@ -813,3 +823,6 @@ configs:
    # argocdServerAdminPassword:
    # Password modification time defaults to current time if not set
    # argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z"
+
+openshift:
+  enabled: false
--- a/charts/argo-rollouts/.helmignore
+++ b/charts/argo-rollouts/.helmignore
@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
--- a/charts/argo-rollouts/Chart.yaml
+++ b/charts/argo-rollouts/Chart.yaml
@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "0.7"
+appVersion: "0.8.0"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 0.2.0
+version: 0.3.0
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
--- a/charts/argo-rollouts/README.md
+++ b/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.2.0`
+Current chart version is `0.3.0`

 Source code can be found [here](https://github.com/argoproj/argo-rollouts)

@ -33,7 +33,7 @@ $ helm install --name my-release argo/argo-rollouts
 | controller.component | string | `"rollouts-controller"` |  |
 | controller.image.pullPolicy | string | `"IfNotPresent"` |  |
 | controller.image.repository | string | `"argoproj/argo-rollouts"` |  |
-| controller.image.tag | string | `"v0.7.0"` |  |
+| controller.image.tag | string | `"v0.8.0"` |  |
 | controller.name | string | `"argo-rollouts"` |  |
 | imagePullSecrets | list | `[]` |  |
 | installCRDs | bool | `true` |  |
--- a/charts/argo-rollouts/templates/argo-rollouts-role.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-role.yaml
@ -71,6 +71,16 @@ rules:
  - update
  - patch
  - delete
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses
+  verbs:
+  - create
+  - get
+  - list
+  - watch
+  - patch
 - apiGroups:
  - ""
  resources:
@ -80,8 +90,17 @@ rules:
  - update
  - patch
 - apiGroups:
-    - ""
+  - ""
  resources:
-    - secrets
+  - secrets
  verbs:
-    - get
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - list
+  - delete
--- a/charts/argo-rollouts/templates/crds/rollout-crd.yaml
+++ b/charts/argo-rollouts/templates/crds/rollout-crd.yaml
@ -61,6 +61,9 @@ spec:
            replicas:
              format: int32
              type: integer
+            restartAt:
+              format: date-time
+              type: string
            revisionHistoryLimit:
              format: int32
              type: integer
@ -93,11 +96,54 @@ spec:
                  properties:
                    activeService:
                      type: string
+                    antiAffinity:
+                      properties:
+                        preferredDuringSchedulingIgnoredDuringExecution:
+                          properties:
+                            weight:
+                              format: int32
+                              type: integer
+                          required:
+                          - weight
+                          type: object
+                        requiredDuringSchedulingIgnoredDuringExecution:
+                          type: object
+                      type: object
                    autoPromotionEnabled:
                      type: boolean
                    autoPromotionSeconds:
                      format: int32
                      type: integer
+                    postPromotionAnalysis:
+                      properties:
+                        args:
+                          items:
+                            properties:
+                              name:
+                                type: string
+                              value:
+                                type: string
+                              valueFrom:
+                                properties:
+                                  podTemplateHashValue:
+                                    type: string
+                                type: object
+                            required:
+                            - name
+                            type: object
+                          type: array
+                        templateName:
+                          type: string
+                        templates:
+                          items:
+                            properties:
+                              templateName:
+                                type: string
+                            required:
+                            - templateName
+                            type: object
+                          type: array
+                      type: object
                    prePromotionAnalysis:
                      properties:
                        args:
@ -177,6 +223,19 @@ spec:
                            type: object
                          type: array
                      type: object
+                    antiAffinity:
+                      properties:
+                        preferredDuringSchedulingIgnoredDuringExecution:
+                          properties:
+                            weight:
+                              format: int32
+                              type: integer
+                          required:
+                          - weight
+                          type: object
+                        requiredDuringSchedulingIgnoredDuringExecution:
+                          type: object
+                      type: object
                    canaryService:
                      type: string
                    maxSurge:
@ -323,6 +382,19 @@ spec:
                      type: array
                    trafficRouting:
                      properties:
+                        alb:
+                          properties:
+                            annotationPrefix:
+                              type: string
+                            ingress:
+                              type: string
+                            servicePort:
+                              format: int32
+                              type: integer
+                          required:
+                          - ingress
+                          - servicePort
+                          type: object
                        istio:
                          properties:
                            virtualService:
@ -2870,6 +2942,8 @@ spec:
              properties:
                activeSelector:
                  type: string
+                postPromotionAnalysisRun:
+                  type: string
                prePromotionAnalysisRun:
                  type: string
                previewSelector:
@ -2952,6 +3026,9 @@ spec:
            replicas:
              format: int32
              type: integer
+            restartedAt:
+              format: date-time
+              type: string
            selector:
              type: string
            stableRS:
--- a/charts/argo-rollouts/values.yaml
+++ b/charts/argo-rollouts/values.yaml
@ -7,7 +7,7 @@ controller:
  component: rollouts-controller
  image:
    repository: argoproj/argo-rollouts
-    tag: v0.7.0
+    tag: v0.8.0
    pullPolicy: IfNotPresent

 serviceAccount:
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v2.7.2
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.7.4
+version: 0.7.6
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
--- a/charts/argo/templates/server-ingress.yaml
+++ b/charts/argo/templates/server-ingress.yaml
@ -2,7 +2,11 @@
 {{- if .Values.server.ingress.enabled -}}
 {{- $serviceName := printf "%s-%s" .Release.Name .Values.server.name -}}
 {{- $servicePort := .Values.server.servicePort -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: networking.k8s.io/v1beta1
+{{ else }}
 apiVersion: extensions/v1beta1
+{{ end -}}
 kind: Ingress
 metadata:
  name: {{ .Release.Name }}-{{ .Values.server.name }}
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@ -41,6 +41,9 @@ data:
        {{- if .Values.artifactRepository.s3.keyPrefix }}
        keyPrefix: {{ .Values.artifactRepository.s3.keyPrefix }}
        {{- end }}
+        {{- if .Values.artifactRepository.s3.region }}
+        region: {{ .Values.artifactRepository.s3.region }}
+        {{- end }}
      {{- end}}
    {{- if .Values.controller.metricsConfig.enabled }}
    metricsConfig:
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@ -198,6 +198,7 @@ artifactRepository:
    insecure: true
    # bucket:
    # endpoint:
+    # region:

 # NOTE: These are setting attributes for the `minio` optional dependency
 minio: