Update Helm definitions.
Related story: PROD-26890
Change-Id: I87af2318a52d7c21428ca0c409f000bde7ee3b8d
diff --git a/kubernetes/files/kube-addons/helm/helm-tiller-deploy.yml b/kubernetes/files/kube-addons/helm/helm-tiller-deploy.yml
index ef8df02..ffd159e 100644
--- a/kubernetes/files/kube-addons/helm/helm-tiller-deploy.yml
+++ b/kubernetes/files/kube-addons/helm/helm-tiller-deploy.yml
@@ -3,7 +3,6 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- annotations:
labels:
app: helm
name: tiller
@@ -12,10 +11,7 @@
namespace: kube-system
spec:
replicas: 1
- selector:
- matchLabels:
- app: helm
- name: tiller
+ strategy: {}
template:
metadata:
labels:
@@ -27,14 +23,17 @@
{%- endif %}
spec:
{%- if 'RBAC' in master.auth.get('mode', "") %}
+ automountServiceAccountToken: true
serviceAccountName: tiller
{%- endif %}
- tolerations:
- - key: node-role.kubernetes.io/master
- effect: NoSchedule
containers:
- image: {{ common.addons.helm.tiller_image }}
imagePullPolicy: IfNotPresent
+ env:
+ - name: TILLER_NAMESPACE
+ value: kube-system
+ - name: TILLER_HISTORY_MAX
+ value: "0"
resources:
requests:
memory: "128Mi"
@@ -57,6 +56,9 @@
- containerPort: 44134
name: tiller
protocol: TCP
+ - containerPort: 44135
+ name: http
+ protocol: TCP
readinessProbe:
failureThreshold: 3
httpGet:
@@ -68,7 +70,6 @@
successThreshold: 1
timeoutSeconds: 1
resources: {}
- terminationMessagePath: /dev/termination-log
dnsPolicy: ClusterFirst
restartPolicy: Always
securityContext: {}