From 6a26babc2851776aafcaa97bdb6a360e788e20dd Mon Sep 17 00:00:00 2001 From: Jonathan Serafini Date: Wed, 24 Jun 2020 09:48:41 -0400 Subject: [PATCH 1/2] feat(argocd): Allow specifying annotations for serviceaccounts (#371) * feat(argocd): Allow specifying annotations for serviceaccounts * chore(argocd): update argocd chart to 2.3.7 Co-authored-by: Spencer Gilbert --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 5 +++++ .../argocd-application-controller/serviceaccount.yaml | 6 ++++++ charts/argo-cd/templates/argocd-server/serviceaccount.yaml | 6 ++++++ charts/argo-cd/values.yaml | 4 ++++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index af39aec8..ec2f141c 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.5.4" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.3.6 +version: 2.3.7 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 4a2e4be9..3a4c3f0d 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -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/) | `[]` | diff --git a/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml b/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml index fbbb0b78..f93114a6 100644 --- a/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml +++ b/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" . }} diff --git a/charts/argo-cd/templates/argocd-server/serviceaccount.yaml b/charts/argo-cd/templates/argocd-server/serviceaccount.yaml index b8549600..2c02f6b7 100644 --- a/charts/argo-cd/templates/argocd-server/serviceaccount.yaml +++ b/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" . }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 45d20995..ac3f883c 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -113,6 +113,8 @@ controller: serviceAccount: create: true name: argocd-application-controller + ## Annotations applied to created service account + annotations: {} ## Server metrics controller configuration metrics: @@ -426,6 +428,8 @@ server: serviceAccount: create: true name: argocd-server + ## Annotations applied to created service account + annotations: {} ingress: enabled: false From ad6893449f86345fce08e4e7ed46c0bad83df325 Mon Sep 17 00:00:00 2001 From: Alin Balutoiu Date: Wed, 24 Jun 2020 17:01:53 +0200 Subject: [PATCH 2/2] chore: Update argocd version to 1.6.1 (#379) Signed-off-by: Alin Balutoiu Co-authored-by: Spencer Gilbert --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/README.md | 5 +++-- charts/argo-cd/crds/crd-application.yaml | 28 +++++++++++++++++++++++- charts/argo-cd/values.yaml | 12 +++++----- 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index ec2f141c..810cd4f8 100644 --- a/charts/argo-cd/Chart.yaml +++ b/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.7 +version: 2.4.0 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 3a4c3f0d..de926d7a 100644 --- a/charts/argo-cd/README.md +++ b/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 | `[]` | @@ -292,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/) | `{}` | @@ -311,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"` | diff --git a/charts/argo-cd/crds/crd-application.yaml b/charts/argo-cd/crds/crd-application.yaml index 0d4f9651..e51c04bb 100644 --- a/charts/argo-cd/crds/crd-application.yaml +++ b/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: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index ac3f883c..ad0ebed3 100755 --- a/charts/argo-cd/values.yaml +++ b/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 @@ -243,7 +243,7 @@ redis: image: repository: redis - tag: 5.0.3 + tag: 5.0.8 imagePullPolicy: IfNotPresent containerPort: 6379 @@ -305,6 +305,8 @@ redis-ha: enabled: true metrics: enabled: true + image: + tag: 5.0.8-alpine ## Server server: @@ -321,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 @@ -597,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