Merge pull request #5615 from justinsb/cherrypick_5595_release-1.10

Cherry pick of #5595 onto release-1.10
kubernetes · Aug 15, 2018 · 1bc0366 · 1bc0366
2 parents 9a14cfc + 0ce25b2
commit 1bc0366
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template
@@ -1,3 +1,13 @@
+{{- if WeaveSecret }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: weave-net
+  namespace: kube-system
+stringData:
+  network-password: {{ WeaveSecret }}
+---
+{{- end }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -128,6 +138,13 @@ spec:
             - name: CONN_LIMIT
               value: "{{ .Networking.Weave.ConnLimit }}"
             {{- end }}
+            {{- if WeaveSecret }}
+            - name: WEAVE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: weave-net
+                  key: network-password
+            {{- end }}
           image: 'weaveworks/weave-kube:2.3.0'
           livenessProbe:
             httpGet: