summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-09 16:24:48 +0000
committerGerrit Code Review <review@openstack.org>2018-10-09 16:24:48 +0000
commit6133b489d4605d70874a68791c7f27b77bf9e024 (patch)
treeaae7c0627d0b55bdfdde0a26c443166e6be840de
parentab314cd43912db27ecfddd9ad49636e7fdae1ee6 (diff)
parentd738bbf314aec262a11048cbc6139db3bd33e0dc (diff)
Merge "Re-align Kubernetes proxy chart with upstream DS"
-rw-r--r--charts/proxy/templates/daemonset.yaml24
1 files changed, 17 insertions, 7 deletions
diff --git a/charts/proxy/templates/daemonset.yaml b/charts/proxy/templates/daemonset.yaml
index ac77e10..4c991f1 100644
--- a/charts/proxy/templates/daemonset.yaml
+++ b/charts/proxy/templates/daemonset.yaml
@@ -50,18 +50,15 @@ spec:
50{{ tuple $envAll $envAll.Values.pod.resources.proxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }} 50{{ tuple $envAll $envAll.Values.pod.resources.proxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
51 securityContext: 51 securityContext:
52 privileged: true 52 privileged: true
53 # volumeMounts:
54 # - mountPath: /run/xtables.lock
55 # name: xtables-lock
56 # readOnly: false
57 # - mountPath: /lib/modules
58 # name: lib-modules
59 # readOnly: true
60 env: 53 env:
61 - name: KUBERNETES_SERVICE_HOST 54 - name: KUBERNETES_SERVICE_HOST
62 value: {{ .Values.kube_service.host }} 55 value: {{ .Values.kube_service.host }}
63 - name: KUBERNETES_SERVICE_PORT 56 - name: KUBERNETES_SERVICE_PORT
64 value: {{ .Values.kube_service.port | quote }} 57 value: {{ .Values.kube_service.port | quote }}
58 - name: NODE_NAME
59 valueFrom:
60 fieldRef:
61 fieldPath: spec.nodeName
65 livenessProbe: 62 livenessProbe:
66{{ toYaml .Values.livenessProbe.config | indent 10 }} 63{{ toYaml .Values.livenessProbe.config | indent 10 }}
67 exec: 64 exec:
@@ -76,10 +73,23 @@ spec:
76 volumeMounts: 73 volumeMounts:
77 - name: bin 74 - name: bin
78 mountPath: /tmp/bin/ 75 mountPath: /tmp/bin/
76 - mountPath: /run/xtables.lock
77 name: xtables-lock
78 readOnly: false
79 - mountPath: /lib/modules
80 name: lib-modules
81 readOnly: true
79 serviceAccountName: kube-proxy 82 serviceAccountName: kube-proxy
80 volumes: 83 volumes:
81 - name: bin 84 - name: bin
82 configMap: 85 configMap:
83 name: kubernetes-proxy-bin 86 name: kubernetes-proxy-bin
84 defaultMode: 0555 87 defaultMode: 0555
88 - name: xtables-lock
89 hostPath:
90 path: /run/xtables.lock
91 type: FileOrCreate
92 - name: lib-modules
93 hostPath:
94 path: /lib/modules
85{{- end }} 95{{- end }}