From 5941368767720d041f2918983e4a4018d9d41ca1 Mon Sep 17 00:00:00 2001
From: Mike Kelley <mike@codezombie.org>
Date: Tue, 17 Jul 2018 21:29:48 -0700
Subject: [PATCH] add support for weave password

---
 cluster/defaults.go | 3 +++
 cluster/network.go  | 3 +++
 templates/weave.go  | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/cluster/defaults.go b/cluster/defaults.go
index 0f675d6d..33b113a3 100644
--- a/cluster/defaults.go
+++ b/cluster/defaults.go
@@ -260,6 +260,9 @@ func (c *Cluster) setClusterNetworkDefaults() {
 	if c.Network.CanalNetworkProvider != nil {
 		networkPluginConfigDefaultsMap[CanalIface] = c.Network.CanalNetworkProvider.Iface
 	}
+	if c.Network.WeaveNetworkProvider != nil {
+		networkPluginConfigDefaultsMap[WeavePassword] = c.Network.WeaveNetworkProvider.Password
+	}
 	for k, v := range networkPluginConfigDefaultsMap {
 		setDefaultIfEmptyMapValue(c.Network.Options, k, v)
 	}
diff --git a/cluster/network.go b/cluster/network.go
index 30d456a5..f68e9a47 100644
--- a/cluster/network.go
+++ b/cluster/network.go
@@ -51,6 +51,7 @@ const (
 	CanalFlannelBackendType = "canal_flannel_backend_type"
 
 	WeaveNetworkPlugin = "weave"
+	WeavePasswordKey   = "weave_password"
 
 	// List of map keys to be used with network templates
 
@@ -88,6 +89,7 @@ const (
 	FlannelInterface = "FlannelInterface"
 	FlannelBackend   = "FlannelBackend"
 	CanalInterface   = "CanalInterface"
+	WeavePassword    = "WeavePassword"
 	RBACConfig       = "RBACConfig"
 	ClusterVersion   = "ClusterVersion"
 )
@@ -190,6 +192,7 @@ func (c *Cluster) doCanalDeploy(ctx context.Context) error {
 func (c *Cluster) doWeaveDeploy(ctx context.Context) error {
 	weaveConfig := map[string]interface{}{
 		ClusterCIDR:        c.ClusterCIDR,
+		WeavePassword:      c.Network.Options[WeavePasswordKey],
 		Image:              c.SystemImages.WeaveNode,
 		CNIImage:           c.SystemImages.WeaveCNI,
 		WeaveLoopbackImage: c.SystemImages.Alpine,
diff --git a/templates/weave.go b/templates/weave.go
index 5793dcc8..cde4a080 100644
--- a/templates/weave.go
+++ b/templates/weave.go
@@ -45,6 +45,10 @@ items:
                       fieldPath: spec.nodeName
                 - name: IPALLOC_RANGE
                   value: "{{.ClusterCIDR}}"
+                {{- if .WeavePassword}}
+                - name: WEAVE_PASSWORD
+                  value: "{{.WeavePassword}}"
+                {{- end}}
               image: {{.Image}}
               livenessProbe:
                 httpGet: