From ca53ad463a24ee62e496e50cd5346744ac31fdd8 Mon Sep 17 00:00:00 2001 From: Jaret Deprin Date: Tue, 15 Oct 2019 18:40:16 -0700 Subject: [PATCH] Removes server.enabled As suggested, the server should always be enabled. --- charts/argo-cd/README.md | 1 - charts/argo-cd/templates/argocd-configs/argocd-cm.yaml | 4 +--- charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml | 4 +--- .../templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml | 4 +--- .../templates/argocd-configs/argocd-tls-certs-cm.yaml | 4 +--- charts/argo-cd/templates/argocd-server/applications.yaml | 3 +-- charts/argo-cd/templates/argocd-server/certificate.yaml | 5 ++--- charts/argo-cd/templates/argocd-server/clusterrole.yaml | 5 ++--- .../argo-cd/templates/argocd-server/clusterrolebinding.yaml | 3 +-- charts/argo-cd/templates/argocd-server/deployment.yaml | 4 +--- charts/argo-cd/templates/argocd-server/projects.yaml | 3 +-- charts/argo-cd/templates/argocd-server/role.yaml | 4 +--- charts/argo-cd/templates/argocd-server/rolebinding.yaml | 4 +--- charts/argo-cd/templates/argocd-server/service.yaml | 4 +--- charts/argo-cd/templates/argocd-server/serviceaccount.yaml | 4 +--- charts/argo-cd/values.yaml | 1 - 16 files changed, 16 insertions(+), 41 deletions(-) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 796141b9..e267ae20 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -138,7 +138,6 @@ $ helm install --name my-release argo/argo-cd | server.clusterAdminAccess.enabled | Enable RBAC for cluster admin access | `true` | | server.config | URL for Argo CD | `{}` | | server.containerPort | Server container port. | `8080` | -| server.enabled | Enable Argo CD Server | `true` | | server.extraArgs | Additional arguments for the server | `[]` | | server.image.repository | Repository to use for the server | `global.image.repository` | | server.image.imagePullPolicy | Image pull policy for the server | `global.image.imagePullPolicy` | diff --git a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml index a2ea527f..ee1f90af 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml @@ -1,4 +1,3 @@ -{{- if .Values.server.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -11,5 +10,4 @@ metadata: app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} app.kubernetes.io/component: {{ .Values.server.name }} data: -{{- toYaml .Values.server.config | nindent 4 }} -{{- end }} \ No newline at end of file +{{- toYaml .Values.server.config | nindent 4 }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml index dfdf4a58..44b1db4b 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-rbac-cm.yaml @@ -1,4 +1,3 @@ -{{- if .Values.server.enabled }} apiVersion: v1 kind: ConfigMap metadata: @@ -11,5 +10,4 @@ metadata: app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} app.kubernetes.io/component: {{ .Values.server.name }} data: -{{- toYaml .Values.server.rbacConfig | nindent 4 }} -{{- end }} \ No newline at end of file +{{- toYaml .Values.server.rbacConfig | nindent 4 }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml index 62d5b7d8..30d6502c 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml @@ -1,4 +1,3 @@ -{{- if and .Values.server.enabled }} apiVersion: v1 {{- toYaml .Values.configs.knownHosts | nindent 0 }} kind: ConfigMap @@ -10,5 +9,4 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} app.kubernetes.io/component: {{ .Values.server.name }} - name: argocd-ssh-known-hosts-cm -{{- end }} \ No newline at end of file + name: argocd-ssh-known-hosts-cm \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml index d7ae63f5..9f41d583 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-tls-certs-cm.yaml @@ -1,4 +1,3 @@ -{{- if and .Values.server.enabled }} apiVersion: v1 {{- toYaml .Values.configs.tlsCerts | nindent 0 }} kind: ConfigMap @@ -10,5 +9,4 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} app.kubernetes.io/component: {{ .Values.server.name }} - name: argocd-tls-certs-cm -{{- end }} \ No newline at end of file + name: argocd-tls-certs-cm \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/applications.yaml b/charts/argo-cd/templates/argocd-server/applications.yaml index db1c7f2c..379e8533 100644 --- a/charts/argo-cd/templates/argocd-server/applications.yaml +++ b/charts/argo-cd/templates/argocd-server/applications.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.server.enabled .Values.server.additionalApplications }} +{{- if .Values.server.additionalApplications }} apiVersion: v1 kind: List items: @@ -38,5 +38,4 @@ items: ignoreDifferences: {{- toYaml .ignoreDifferences | nindent 8 }} {{- end }} -{{- end }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/certificate.yaml b/charts/argo-cd/templates/argocd-server/certificate.yaml index 22943bad..6a3510b4 100644 --- a/charts/argo-cd/templates/argocd-server/certificate.yaml +++ b/charts/argo-cd/templates/argocd-server/certificate.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.server.enabled .Values.server.certificate.enabled -}} +{{- if .Values.server.certificate.enabled -}} apiVersion: certmanager.k8s.io/v1alpha1 kind: Certificate metadata: @@ -20,5 +20,4 @@ spec: issuerRef: kind: {{ .Values.certificate.issuer.kind | quote }} name: {{ .Values.certificate.issuer.name | quote }} - secretName: argocd-secret -{{- end }} + secretName: argocd-secret \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/clusterrole.yaml b/charts/argo-cd/templates/argocd-server/clusterrole.yaml index 19aa364a..3de9c75e 100644 --- a/charts/argo-cd/templates/argocd-server/clusterrole.yaml +++ b/charts/argo-cd/templates/argocd-server/clusterrole.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.server.enabled .Values.server.clusterAdminAccess.enabled }} +{{- if .Values.server.clusterAdminAccess.enabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: @@ -31,5 +31,4 @@ rules: - pods - pods/log verbs: - - get -{{- end }} + - get \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/clusterrolebinding.yaml b/charts/argo-cd/templates/argocd-server/clusterrolebinding.yaml index 3529c5ee..338f2eea 100644 --- a/charts/argo-cd/templates/argocd-server/clusterrolebinding.yaml +++ b/charts/argo-cd/templates/argocd-server/clusterrolebinding.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.server.enabled .Values.server.clusterAdminAccess.enabled }} +{{- if .Values.server.clusterAdminAccess.enabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: @@ -18,4 +18,3 @@ subjects: - kind: ServiceAccount name: {{ template "argo-cd.serverServiceAccountName" . }} namespace: {{ .Release.Namespace }} -{{- end -}} diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index e05e284b..9112b1ce 100644 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -1,4 +1,3 @@ -{{- if .Values.server.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -128,5 +127,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-server/projects.yaml b/charts/argo-cd/templates/argocd-server/projects.yaml index 19337962..9fa29efb 100644 --- a/charts/argo-cd/templates/argocd-server/projects.yaml +++ b/charts/argo-cd/templates/argocd-server/projects.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.server.enabled .Values.server.additionalProjects }} +{{- if .Values.server.additionalProjects }} apiVersion: v1 kind: List items: @@ -42,5 +42,4 @@ items: roles: {{- toYaml .roles | nindent 8 }} {{- end }} -{{- end }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/role.yaml b/charts/argo-cd/templates/argocd-server/role.yaml index e95e488d..e966f52b 100644 --- a/charts/argo-cd/templates/argocd-server/role.yaml +++ b/charts/argo-cd/templates/argocd-server/role.yaml @@ -1,4 +1,3 @@ -{{- if .Values.server.enabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -43,5 +42,4 @@ rules: - events verbs: - create - - list -{{- end }} \ No newline at end of file + - list \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/rolebinding.yaml b/charts/argo-cd/templates/argocd-server/rolebinding.yaml index 2972b396..524e30bf 100644 --- a/charts/argo-cd/templates/argocd-server/rolebinding.yaml +++ b/charts/argo-cd/templates/argocd-server/rolebinding.yaml @@ -1,4 +1,3 @@ -{{- if .Values.server.enabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: @@ -17,5 +16,4 @@ roleRef: subjects: - kind: ServiceAccount name: {{ template "argo-cd.serverServiceAccountName" . }} - namespace: {{ .Release.Namespace }} -{{- end }} \ No newline at end of file + namespace: {{ .Release.Namespace }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml index aba5e9e5..40acff4a 100644 --- a/charts/argo-cd/templates/argocd-server/service.yaml +++ b/charts/argo-cd/templates/argocd-server/service.yaml @@ -1,4 +1,3 @@ -{{- if .Values.server.enabled }} apiVersion: v1 kind: Service metadata: @@ -29,5 +28,4 @@ spec: targetPort: {{ .Values.server.name }} selector: app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} -{{- end }} \ No newline at end of file + app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/serviceaccount.yaml b/charts/argo-cd/templates/argocd-server/serviceaccount.yaml index d44d6662..18285a05 100644 --- a/charts/argo-cd/templates/argocd-server/serviceaccount.yaml +++ b/charts/argo-cd/templates/argocd-server/serviceaccount.yaml @@ -1,4 +1,3 @@ -{{- if .Values.server.enabled }} apiVersion: v1 kind: ServiceAccount metadata: @@ -9,5 +8,4 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} - app.kubernetes.io/component: {{ .Values.server.name }} -{{- end }} \ No newline at end of file + app.kubernetes.io/component: {{ .Values.server.name }} \ No newline at end of file diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 62beb14f..c326fa20 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -183,7 +183,6 @@ redis: ## Server server: - enabled: true name: server image: {}