From 4fe65a4e0932e66155e21c485ad04df41098249a Mon Sep 17 00:00:00 2001 From: Jaret Deprin Date: Tue, 15 Oct 2019 18:31:54 -0700 Subject: [PATCH] Removes controller.enabled As suggested, the controller should always be enabled. --- charts/argo-cd/README.md | 1 - .../templates/argocd-application-controller/clusterrole.yaml | 4 +--- .../argocd-application-controller/clusterrolebinding.yaml | 4 +--- .../templates/argocd-application-controller/deployment.yaml | 2 -- .../argo-cd/templates/argocd-application-controller/role.yaml | 4 +--- .../templates/argocd-application-controller/rolebinding.yaml | 4 +--- .../templates/argocd-application-controller/service.yaml | 4 +--- .../argocd-application-controller/serviceaccount.yaml | 4 +--- charts/argo-cd/values.yaml | 1 - 9 files changed, 6 insertions(+), 22 deletions(-) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 964f5cfc..02e300a9 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -50,7 +50,6 @@ $ helm install --name my-release argo/argo-cd | controller.args.operationProcessors | define the controller `--operation-processors` | `"10"` | | controller.args.statusProcessors | define the controller `--status-processors` | `"20"` | | controller.containerPort | Controller listening port. | `8082` | -| controller.enabled | Enable ArgoCD Controller | `true` | | controller.extraArgs | Additional arguments for the controller. | `[]` | | controller.image.repository | Repository to use for the controller | `global.image.repository` | | controller.image.imagePullPolicy | Image pull policy for the controller | `global.image.imagePullPolicy` | diff --git a/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml b/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml index 87a94cab..f82cff3e 100644 --- a/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml @@ -1,4 +1,3 @@ -{{- if .Values.controller.enabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: @@ -20,5 +19,4 @@ rules: - nonResourceURLs: - '*' verbs: - - '*' -{{- end }} \ No newline at end of file + - '*' \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml b/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml index 80ae4db8..03076d00 100644 --- a/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml @@ -1,4 +1,3 @@ -{{- if .Values.controller.enabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: @@ -17,5 +16,4 @@ roleRef: subjects: - kind: ServiceAccount name: {{ template "argo-cd.controllerServiceAccountName" . }} - 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-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml index e93c6906..789a067f 100644 --- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml @@ -1,4 +1,3 @@ -{{- if .Values.controller.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -102,5 +101,4 @@ spec: {{- if .Values.controller.volumes }} volumes: {{- toYaml .Values.controller.volumes | nindent 8 }} -{{- end }} {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-application-controller/role.yaml b/charts/argo-cd/templates/argocd-application-controller/role.yaml index 2992bddb..24ed4b07 100644 --- a/charts/argo-cd/templates/argocd-application-controller/role.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/role.yaml @@ -1,4 +1,3 @@ -{{- if .Values.controller.enabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -39,5 +38,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-application-controller/rolebinding.yaml b/charts/argo-cd/templates/argocd-application-controller/rolebinding.yaml index 2bd42a48..fe99c47e 100644 --- a/charts/argo-cd/templates/argocd-application-controller/rolebinding.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/rolebinding.yaml @@ -1,4 +1,3 @@ -{{- if .Values.controller.enabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: @@ -17,5 +16,4 @@ roleRef: subjects: - kind: ServiceAccount name: {{ template "argo-cd.controllerServiceAccountName" . }} - 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-application-controller/service.yaml b/charts/argo-cd/templates/argocd-application-controller/service.yaml index 05610e7e..82e304d9 100644 --- a/charts/argo-cd/templates/argocd-application-controller/service.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/service.yaml @@ -1,4 +1,3 @@ -{{- if .Values.controller.enabled }} apiVersion: v1 kind: Service metadata: @@ -23,5 +22,4 @@ spec: targetPort: {{ .Values.controller.containerPort }} selector: app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} -{{- end }} \ No newline at end of file + app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml b/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml index e08b439d..2d03fb2b 100644 --- a/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml @@ -1,4 +1,3 @@ -{{- if .Values.controller.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.controller.name }} -{{- end }} \ No newline at end of file + app.kubernetes.io/component: {{ .Values.controller.name }} \ No newline at end of file diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index e37e5a0b..f2be04c7 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -11,7 +11,6 @@ global: ## Controller controller: - enabled: true name: application-controller image: {}