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 index cccad7ac43c60..f4eb4f4a69eae 100644 --- 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: