UNCLASSIFIED

Skip to content

GitLab

Commit 5972e8a4 authored by Manuel Buil's avatar Manuel Buil
Browse files

Add 2 new helm global values that separate v4 and v6 

Linked issue: https://github.com/rancher/rke2/issues/1717

Signed-off-by: default avatarManuel Buil <mbuil@suse.com>
parent 82ca956e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
pkg/bootstrap/bootstrap.go
View file @ 5972e8a4
...@@ -267,6 +267,8 @@ func setChartValues(manifestsDir string, nodeConfig *daemonconfig.Node, cfg cmds ...@@ -267,6 +267,8 @@ func setChartValues(manifestsDir string, nodeConfig *daemonconfig.Node, cfg cmds
serializer := json.NewSerializerWithOptions(json.DefaultMetaFactory, schemes.All, schemes.All, json.SerializerOptions{Yaml: true, Pretty: true, Strict: true}) serializer := json.NewSerializerWithOptions(json.DefaultMetaFactory, schemes.All, schemes.All, json.SerializerOptions{Yaml: true, Pretty: true, Strict: true})
chartValues := map[string]string{ chartValues := map[string]string{
"global.clusterCIDR": util.JoinIPNets(nodeConfig.AgentConfig.ClusterCIDRs), "global.clusterCIDR": util.JoinIPNets(nodeConfig.AgentConfig.ClusterCIDRs),
"global.clusterCIDRv4": util.JoinIP4Nets(nodeConfig.AgentConfig.ClusterCIDRs),
"global.clusterCIDRv6": util.JoinIP6Nets(nodeConfig.AgentConfig.ClusterCIDRs),
"global.clusterDNS": util.JoinIPs(nodeConfig.AgentConfig.ClusterDNSs), "global.clusterDNS": util.JoinIPs(nodeConfig.AgentConfig.ClusterDNSs),
"global.clusterDomain": nodeConfig.AgentConfig.ClusterDomain, "global.clusterDomain": nodeConfig.AgentConfig.ClusterDomain,
"global.rke2DataDir": cfg.DataDir, "global.rke2DataDir": cfg.DataDir,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED