Removes controller.enabled

As suggested, the controller should always be enabled.
This commit is contained in:
Jaret Deprin 2019-10-15 18:31:54 -07:00
parent 89716e2ebc
commit 4fe65a4e09
9 changed files with 6 additions and 22 deletions

View file

@ -50,7 +50,6 @@ $ helm install --name my-release argo/argo-cd
| controller.args.operationProcessors | define the controller `--operation-processors` | `"10"` | | controller.args.operationProcessors | define the controller `--operation-processors` | `"10"` |
| controller.args.statusProcessors | define the controller `--status-processors` | `"20"` | | controller.args.statusProcessors | define the controller `--status-processors` | `"20"` |
| controller.containerPort | Controller listening port. | `8082` | | controller.containerPort | Controller listening port. | `8082` |
| controller.enabled | Enable ArgoCD Controller | `true` |
| controller.extraArgs | Additional arguments for the controller. | `[]` | | controller.extraArgs | Additional arguments for the controller. | `[]` |
| controller.image.repository | Repository to use for the controller | `global.image.repository` | | controller.image.repository | Repository to use for the controller | `global.image.repository` |
| controller.image.imagePullPolicy | Image pull policy for the controller | `global.image.imagePullPolicy` | | controller.image.imagePullPolicy | Image pull policy for the controller | `global.image.imagePullPolicy` |

View file

@ -1,4 +1,3 @@
{{- if .Values.controller.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
@ -20,5 +19,4 @@ rules:
- nonResourceURLs: - nonResourceURLs:
- '*' - '*'
verbs: verbs:
- '*' - '*'
{{- end }}

View file

@ -1,4 +1,3 @@
{{- if .Values.controller.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
@ -17,5 +16,4 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ template "argo-cd.controllerServiceAccountName" . }} name: {{ template "argo-cd.controllerServiceAccountName" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- end -}}

View file

@ -1,4 +1,3 @@
{{- if .Values.controller.enabled }}
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -102,5 +101,4 @@ spec:
{{- if .Values.controller.volumes }} {{- if .Values.controller.volumes }}
volumes: volumes:
{{- toYaml .Values.controller.volumes | nindent 8 }} {{- toYaml .Values.controller.volumes | nindent 8 }}
{{- end }}
{{- end }} {{- end }}

View file

@ -1,4 +1,3 @@
{{- if .Values.controller.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
@ -39,5 +38,4 @@ rules:
- events - events
verbs: verbs:
- create - create
- list - list
{{- end }}

View file

@ -1,4 +1,3 @@
{{- if .Values.controller.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
@ -17,5 +16,4 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ template "argo-cd.controllerServiceAccountName" . }} name: {{ template "argo-cd.controllerServiceAccountName" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- end }}

View file

@ -1,4 +1,3 @@
{{- if .Values.controller.enabled }}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@ -23,5 +22,4 @@ spec:
targetPort: {{ .Values.controller.containerPort }} targetPort: {{ .Values.controller.containerPort }}
selector: selector:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.controller.name }}
{{- end }}

View file

@ -1,4 +1,3 @@
{{- if .Values.controller.enabled }}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
@ -9,5 +8,4 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
app.kubernetes.io/component: {{ .Values.controller.name }} app.kubernetes.io/component: {{ .Values.controller.name }}
{{- end }}

View file

@ -11,7 +11,6 @@ global:
## Controller ## Controller
controller: controller:
enabled: true
name: application-controller name: application-controller
image: {} image: {}