File tree Expand file tree Collapse file tree 10 files changed +32
-19
lines changed
charts/marklogic-operator-kubernetes Expand file tree Collapse file tree 10 files changed +32
-19
lines changed Original file line number Diff line number Diff line change 6464 securityContext : {{- toYaml .Values.controllerManager.manager.containerSecurityContext
6565 | nindent 10 }}
6666 imagePullSecrets : {{ .Values.imagePullSecrets | default list | toJson }}
67+ nodeSelector : {{- toYaml .Values.controllerManager.nodeSelector | nindent 8 }}
6768 securityContext : {{- toYaml .Values.controllerManager.podSecurityContext | nindent
6869 8 }}
69- serviceAccountName : marklogic-operator-controller-manager
70- terminationGracePeriodSeconds : 10
70+ serviceAccountName : {{ include "marklogic-operator-kubernetes.serviceAccountName"
71+ . }}
72+ terminationGracePeriodSeconds : 10
73+ tolerations : {{- toYaml .Values.controllerManager.tolerations | nindent 8 }}
74+ topologySpreadConstraints : {{- toYaml .Values.controllerManager.topologySpreadConstraints
75+ | nindent 8 }}
Original file line number Diff line number Diff line change @@ -55,5 +55,5 @@ roleRef:
5555 name : marklogic-operator-leader-election-role
5656subjects :
5757- kind : ServiceAccount
58- name : marklogic-operator-controller-manager
59- namespace : ' {{ .Release.Namespace }}'
58+ name : ' {{ include " marklogic-operator-kubernetes.serviceAccountName" . }} '
59+ namespace : ' {{ .Release.Namespace }}'
Original file line number Diff line number Diff line change @@ -93,5 +93,5 @@ roleRef:
9393 name : marklogic-operator-manager-role
9494subjects :
9595- kind : ServiceAccount
96- name : marklogic-operator-controller-manager
97- namespace : ' {{ .Release.Namespace }}'
96+ name : ' {{ include " marklogic-operator-kubernetes.serviceAccountName" . }} '
97+ namespace : ' {{ .Release.Namespace }}'
Original file line number Diff line number Diff line change @@ -10014,4 +10014,4 @@ status:
1001410014 kind: ""
1001510015 plural: ""
1001610016 conditions: []
10017- storedVersions: []
10017+ storedVersions: []
Original file line number Diff line number Diff line change @@ -4991,4 +4991,4 @@ status:
49914991 kind : " "
49924992 plural : " "
49934993 conditions : []
4994- storedVersions : []
4994+ storedVersions : []
Original file line number Diff line number Diff line change 1111- nonResourceURLs :
1212 - /metrics
1313 verbs :
14- - get
14+ - get
Original file line number Diff line number Diff line change 1414 control-plane : controller-manager
1515 {{- include "marklogic-operator-kubernetes.selectorLabels" . | nindent 4 }}
1616 ports :
17- {{- .Values.metricsService.ports | toYaml | nindent 2 }}
17+ {{- .Values.metricsService.ports | toYaml | nindent 2 }}
Original file line number Diff line number Diff line change @@ -36,5 +36,5 @@ roleRef:
3636 name : marklogic-operator-proxy-role
3737subjects :
3838- kind : ServiceAccount
39- name : marklogic-operator-controller-manager
40- namespace : ' {{ .Release.Namespace }}'
39+ name : ' {{ include " marklogic-operator-kubernetes.serviceAccountName" . }} '
40+ namespace : ' {{ .Release.Namespace }}'
Original file line number Diff line number Diff line change 1+ {{ if .Values.serviceAccount.create }}
12apiVersion : v1
23kind : ServiceAccount
34metadata :
4- name : marklogic-operator-controller-manager
5+ name : {{ include " marklogic-operator-kubernetes.serviceAccountName" . }}
56 labels :
6- app.kubernetes.io/component : rbac
7- app.kubernetes.io/created-by : marklogic-operator-kubernetes
8- app.kubernetes.io/part-of : marklogic-operator-kubernetes
97 {{- include "marklogic-operator-kubernetes.labels" . | nindent 4 }}
8+ {{- with .Values.serviceAccount.annotations }}
109 annotations :
11- {{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
10+ {{- toYaml . | nindent 4 }}
11+ {{- end }}
12+ automountServiceAccountToken : {{ .Values.serviceAccount.automount }}
13+ {{- end }}
Original file line number Diff line number Diff line change @@ -44,11 +44,12 @@ controllerManager:
4444 requests :
4545 cpu : 10m
4646 memory : 64Mi
47+ nodeSelector : {}
4748 podSecurityContext :
4849 runAsNonRoot : true
4950 replicas : 1
50- serviceAccount :
51- annotations : {}
51+ tolerations : []
52+ topologySpreadConstraints : []
5253imagePullSecrets : []
5354kubernetesClusterDomain : cluster.local
5455metricsService :
@@ -58,3 +59,8 @@ metricsService:
5859 protocol : TCP
5960 targetPort : https
6061 type : ClusterIP
62+ serviceAccount :
63+ annotations : {}
64+ automount : true
65+ create : true
66+ name : " "
You can’t perform that action at this time.
0 commit comments