mirror of
https://github.com/rancher/rke.git
synced 2025-08-22 08:35:49 +00:00
add support for weave password
This commit is contained in:
parent
91df7eb4eb
commit
5941368767
@ -260,6 +260,9 @@ func (c *Cluster) setClusterNetworkDefaults() {
|
|||||||
if c.Network.CanalNetworkProvider != nil {
|
if c.Network.CanalNetworkProvider != nil {
|
||||||
networkPluginConfigDefaultsMap[CanalIface] = c.Network.CanalNetworkProvider.Iface
|
networkPluginConfigDefaultsMap[CanalIface] = c.Network.CanalNetworkProvider.Iface
|
||||||
}
|
}
|
||||||
|
if c.Network.WeaveNetworkProvider != nil {
|
||||||
|
networkPluginConfigDefaultsMap[WeavePassword] = c.Network.WeaveNetworkProvider.Password
|
||||||
|
}
|
||||||
for k, v := range networkPluginConfigDefaultsMap {
|
for k, v := range networkPluginConfigDefaultsMap {
|
||||||
setDefaultIfEmptyMapValue(c.Network.Options, k, v)
|
setDefaultIfEmptyMapValue(c.Network.Options, k, v)
|
||||||
}
|
}
|
||||||
|
@ -51,6 +51,7 @@ const (
|
|||||||
CanalFlannelBackendType = "canal_flannel_backend_type"
|
CanalFlannelBackendType = "canal_flannel_backend_type"
|
||||||
|
|
||||||
WeaveNetworkPlugin = "weave"
|
WeaveNetworkPlugin = "weave"
|
||||||
|
WeavePasswordKey = "weave_password"
|
||||||
|
|
||||||
// List of map keys to be used with network templates
|
// List of map keys to be used with network templates
|
||||||
|
|
||||||
@ -88,6 +89,7 @@ const (
|
|||||||
FlannelInterface = "FlannelInterface"
|
FlannelInterface = "FlannelInterface"
|
||||||
FlannelBackend = "FlannelBackend"
|
FlannelBackend = "FlannelBackend"
|
||||||
CanalInterface = "CanalInterface"
|
CanalInterface = "CanalInterface"
|
||||||
|
WeavePassword = "WeavePassword"
|
||||||
RBACConfig = "RBACConfig"
|
RBACConfig = "RBACConfig"
|
||||||
ClusterVersion = "ClusterVersion"
|
ClusterVersion = "ClusterVersion"
|
||||||
)
|
)
|
||||||
@ -190,6 +192,7 @@ func (c *Cluster) doCanalDeploy(ctx context.Context) error {
|
|||||||
func (c *Cluster) doWeaveDeploy(ctx context.Context) error {
|
func (c *Cluster) doWeaveDeploy(ctx context.Context) error {
|
||||||
weaveConfig := map[string]interface{}{
|
weaveConfig := map[string]interface{}{
|
||||||
ClusterCIDR: c.ClusterCIDR,
|
ClusterCIDR: c.ClusterCIDR,
|
||||||
|
WeavePassword: c.Network.Options[WeavePasswordKey],
|
||||||
Image: c.SystemImages.WeaveNode,
|
Image: c.SystemImages.WeaveNode,
|
||||||
CNIImage: c.SystemImages.WeaveCNI,
|
CNIImage: c.SystemImages.WeaveCNI,
|
||||||
WeaveLoopbackImage: c.SystemImages.Alpine,
|
WeaveLoopbackImage: c.SystemImages.Alpine,
|
||||||
|
@ -45,6 +45,10 @@ items:
|
|||||||
fieldPath: spec.nodeName
|
fieldPath: spec.nodeName
|
||||||
- name: IPALLOC_RANGE
|
- name: IPALLOC_RANGE
|
||||||
value: "{{.ClusterCIDR}}"
|
value: "{{.ClusterCIDR}}"
|
||||||
|
{{- if .WeavePassword}}
|
||||||
|
- name: WEAVE_PASSWORD
|
||||||
|
value: "{{.WeavePassword}}"
|
||||||
|
{{- end}}
|
||||||
image: {{.Image}}
|
image: {{.Image}}
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
|
Loading…
Reference in New Issue
Block a user