From 9d7c7742405bbcfd41d6211e87d374d6ffd287bb Mon Sep 17 00:00:00 2001 From: "takeshi.nakata" Date: Mon, 20 Apr 2020 12:36:26 +0900 Subject: [PATCH] add BackendConfig configuration --- charts/argo-cd/README.md | 2 ++ .../templates/argocd-server/backendconfig.yaml | 15 +++++++++++++++ charts/argo-cd/values.yaml | 10 ++++++++++ 3 files changed, 27 insertions(+) create mode 100644 charts/argo-cd/templates/argocd-server/backendconfig.yaml diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index adfe7004..8fada6b0 100644 --- 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.backendConfig.enabled | Enable BackendConfig custom resource for Google Kubernetes Engine. | `false` | +| server.backendConfig.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` | diff --git a/charts/argo-cd/templates/argocd-server/backendconfig.yaml b/charts/argo-cd/templates/argocd-server/backendconfig.yaml new file mode 100644 index 00000000..2a835c8c --- /dev/null +++ b/charts/argo-cd/templates/argocd-server/backendconfig.yaml @@ -0,0 +1,15 @@ +{{- if .Values.server.backendConfig.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.backendConfig.spec | nindent 2 }} +{{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 37845070..1b00f301 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -561,6 +561,16 @@ server: clusterAdminAccess: enabled: true + ## Enable BackendConfig custom resource for Google Kubernetes Engine + backendConfig: + enabled: false + spec: {} + # spec: + # iap: + # enabled: true + # oauthclientCredentials: + # secretName: argocd-iap + ## Repo Server repoServer: name: repo-server