Browse Source

Merge "Re-align Kubernetes proxy chart with upstream DS"

Zuul 6 months ago
parent
commit
6133b489d4
1 changed files with 17 additions and 7 deletions
  1. 17
    7
      charts/proxy/templates/daemonset.yaml

+ 17
- 7
charts/proxy/templates/daemonset.yaml View File

@@ -50,18 +50,15 @@ spec:
50 50
 {{ tuple $envAll $envAll.Values.pod.resources.proxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
51 51
         securityContext:
52 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 53
         env:
61 54
           - name: KUBERNETES_SERVICE_HOST
62 55
             value: {{ .Values.kube_service.host }}
63 56
           - name: KUBERNETES_SERVICE_PORT
64 57
             value: {{ .Values.kube_service.port | quote }}
58
+          - name: NODE_NAME
59
+            valueFrom:
60
+              fieldRef:
61
+                fieldPath: spec.nodeName
65 62
         livenessProbe:
66 63
 {{ toYaml .Values.livenessProbe.config | indent 10 }}
67 64
           exec:
@@ -76,10 +73,23 @@ spec:
76 73
         volumeMounts:
77 74
           - name: bin
78 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 82
       serviceAccountName: kube-proxy
80 83
       volumes:
81 84
         - name: bin
82 85
           configMap:
83 86
             name: kubernetes-proxy-bin
84 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 95
 {{- end }}

Loading…
Cancel
Save