Merge pull request #562 from Shunpoco/helm-arg

Configure leader-elect in Helm chart level

Author: vdice

Tiltfile

@@ -19,7 +19,11 @@ install = helm(
     './deploy/helm',
     name='runtime-class-manager',
     namespace='rcm',
-    set=['image.repository=' + settings.get('registry')]
+    set=[
+        'image.repository=' + settings.get('registry'),
+        # Disable the leader election to speed up the startup time.
+        'rcm.leaderElectEnabled=false',
+    ],
 )
 
 objects = decode_yaml_stream(install)
@@ -28,8 +32,6 @@ for o in objects:
     # running process.
     if o.get('kind') == 'Deployment' and o.get('metadata').get('name') == 'runtime-class-manager':
         o['spec']['template']['spec']['securityContext']['runAsNonRoot'] = False
-        # Disable the leader election to speed up the startup time.
-        o['spec']['template']['spec']['containers'][0]['args'].remove('--leader-elect')
         break
 updated_install = encode_yaml_stream(objects)
 k8s_yaml(updated_install)

deploy/helm/templates/deployment.yaml

@@ -36,6 +36,10 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- if .Values.rcm.leaderElectEnabled }}
+          args:
+          - leader-elect
+          {{- end }}
           env:
           - name: CONTROLLER_NAMESPACE
             value: {{ .Release.Namespace }}

deploy/helm/values.yaml

@@ -19,6 +19,7 @@ rcm:
     tag: "latest"
   nodeInstallerJob:
     ttl: 0
+  leaderElectEnabled: false
 
 imagePullSecrets: []
 nameOverride: ""