From 41df9ed6725dd7ece14944bc8daff335dd365b15 Mon Sep 17 00:00:00 2001 From: Jaret Deprin Date: Tue, 15 Oct 2019 18:34:50 -0700 Subject: [PATCH] Removes repoServer.enabled As suggested, the repo-server should always be enabled. --- charts/argo-cd/README.md | 1 - charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 4 +--- charts/argo-cd/templates/argocd-repo-server/service.yaml | 4 +--- charts/argo-cd/values.yaml | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 02e300a9..796141b9 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -92,7 +92,6 @@ $ helm install --name my-release argo/argo-cd |-----|------|---------|-------------| | repoServer.affinity | Assign custom affinity rules to the deployment https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ | `{}` | | repoServer.containerPort | Repo server port | `8081` | -| repoServer.enabled | Create repo server resources | `true` | | repoServer.extraArgs | Additional arguments for the repo server | `[]` | | repoServer.image.repository | Repository to use for the repo server | `global.image.repository` | | repoServer.image.imagePullPolicy | Image pull policy for the repo server | `global.image.imagePullPolicy` | diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index 52e6fec5..68ada2e4 100644 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -1,4 +1,3 @@ -{{- if .Values.repoServer.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -117,5 +116,4 @@ spec: - configMap: name: argocd-tls-certs-cm name: tls-certs - {{- end }} -{{- end }} \ No newline at end of file + {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-repo-server/service.yaml b/charts/argo-cd/templates/argocd-repo-server/service.yaml index 1b676b71..0b5db2d9 100644 --- a/charts/argo-cd/templates/argocd-repo-server/service.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/service.yaml @@ -1,4 +1,3 @@ -{{- if .Values.repoServer.enabled }} apiVersion: v1 kind: Service metadata: @@ -24,5 +23,4 @@ spec: targetPort: repo-server selector: app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }} -{{- end }} \ No newline at end of file + app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.repoServer.name }} \ No newline at end of file diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index f2be04c7..62beb14f 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -386,7 +386,6 @@ server: ## Repo Server repoServer: - enabled: true name: repo-server image: {}