rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-04-27 11:21:08 +00:00
Code Issues Releases Wiki Activity

Make it possible to configure dualstack

Browse Source
This commit is contained in:
Sebastiaan van Steenis 2021-06-25 16:44:47 +02:00
parent 0b27ba619f
commit c5efcaeb0c
6 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/cluster.go
View File

@ -58,7 +58,7 @@ type Cluster struct {
InactiveHosts []*hosts.Host
K8sWrapTransport transport.WrapperFunc
KubeClient *kubernetes.Clientset
KubernetesServiceIP net.IP
KubernetesServiceIP []net.IP
LocalKubeConfigPath string
LocalConnDialerFactory hosts.DialerFactory
PrivateRegistriesMap map[string]v3.PrivateRegistry
@ -736,7 +736,7 @@ func InitClusterObject(ctx context.Context, rkeConfig *v3.RancherKubernetesEngin
}
// extract cluster network configuration
if err = c.setNetworkOptions(); err != nil {
return nil, fmt.Errorf("failed set network options: %v", err)
return nil, fmt.Errorf("Failed to set network options: %v", err)
}
// Register cloud provider

1
cluster/network.go
View File

@ -289,6 +289,7 @@ var EtcdClientPortList = []string{
}
var CalicoNetworkLabels = []string{CalicoNodeLabel, CalicoControllerLabel}
var IPv6CompatibleNetworkPlugins = []string{CalicoNetworkPlugin}
func (c *Cluster) deployNetworkPlugin(ctx context.Context, data map[string]interface{}) error {
log.Infof(ctx, "[network] Setting up network plugin: %s", c.Network.Plugin)

25
cluster/validation.go
View File

@ -208,6 +208,31 @@ func validateNetworkOptions(c *Cluster) error {
if c.Network.Plugin == FlannelNetworkPlugin && c.Network.MTU != 0 {
return fmt.Errorf("Network plugin [%s] does not support configuring MTU", FlannelNetworkPlugin)
}
dualStack := false
serviceClusterRanges := strings.Split(c.Services.KubeAPI.ServiceClusterIPRange, ",")
if len(serviceClusterRanges) > 1 {
logrus.Debugf("Found more than 1 service cluster IP range, assuming dual stack")
dualStack = true
}
clusterCIDRs := strings.Split(c.Services.KubeController.ClusterCIDR, ",")
if len(clusterCIDRs) > 1 {
logrus.Debugf("Found more than 1 cluster CIDR, assuming dual stack")
dualStack = true
}
if dualStack {
IPv6CompatibleNetworkPluginFound := false
for _, networkPlugin := range IPv6CompatibleNetworkPlugins {
if c.Network.Plugin == networkPlugin {
logrus.Debugf("Found IPv6 compatible network plugin [%s] == [%s]", c.Network.Plugin, networkPlugin)
IPv6CompatibleNetworkPluginFound = true
break
}
}
if !IPv6CompatibleNetworkPluginFound {
return fmt.Errorf("Network plugin [%s] does not support IPv6 (dualstack)", c.Network.Plugin)
}
}
if c.Network.Plugin == AciNetworkPlugin {
//Skip cloud options and throw an error.
cloudOptionsList := []string{AciEpRegistry, AciOpflexMode, AciUseHostNetnsVolume, AciUseOpflexServerVolume,

2
pki/pki.go
View File

@ -83,7 +83,7 @@ func RegenerateEtcdCertificate(
etcdHost *hosts.Host,
etcdHosts []*hosts.Host,
clusterDomain string,
KubernetesServiceIP net.IP) (map[string]CertificatePKI, error) {
KubernetesServiceIP []net.IP) (map[string]CertificatePKI, error) {
etcdName := GetCrtNameForHost(etcdHost, EtcdCertName)
log.Infof(ctx, "[certificates] Regenerating new %s certificate and key", etcdName)

2
pki/pki_test.go
View File

@ -86,8 +86,8 @@ func TestPKI(t *testing.T) {
net.ParseIP("127.0.0.1"),
net.ParseIP(rkeConfig.Nodes[0].InternalAddress),
net.ParseIP(rkeConfig.Nodes[0].Address),
kubernetesServiceIP,
}
kubeAPIAltIPs = append(kubeAPIAltIPs, kubernetesServiceIP...)
for _, testIP := range kubeAPIAltIPs {
found := false

31
pki/util.go
View File

@ -163,7 +163,7 @@ func GetIPHostAltnamesForHost(host *hosts.Host) *cert.AltNames {
}
}
func GetAltNames(cpHosts []*hosts.Host, clusterDomain string, KubernetesServiceIP net.IP, SANs []string) *cert.AltNames {
func GetAltNames(cpHosts []*hosts.Host, clusterDomain string, KubernetesServiceIP []net.IP, SANs []string) *cert.AltNames {
ips := []net.IP{}
dnsNames := []string{}
for _, host := range cpHosts {
@ -198,7 +198,7 @@ func GetAltNames(cpHosts []*hosts.Host, clusterDomain string, KubernetesServiceI
}
ips = append(ips, net.ParseIP("127.0.0.1"))
ips = append(ips, KubernetesServiceIP)
ips = append(ips, KubernetesServiceIP...)
dnsNames = append(dnsNames, []string{
"localhost",
"kubernetes",
@ -379,19 +379,24 @@ func getCertKeys(rkeNodes []v3.RKEConfigNode, nodeRole string, rkeConfig *v3.Ran
return certList
}
func GetKubernetesServiceIP(serviceClusterRange string) (net.IP, error) {
ip, ipnet, err := net.ParseCIDR(serviceClusterRange)
if err != nil {
return nil, fmt.Errorf("Failed to get kubernetes service IP from Kube API option [service_cluster_ip_range]: %v", err)
}
ip = ip.Mask(ipnet.Mask)
for j := len(ip) - 1; j >= 0; j-- {
ip[j]++
if ip[j] > 0 {
break
func GetKubernetesServiceIP(serviceClusterRange string) ([]net.IP, error) {
var serviceIPs []net.IP
serviceClusterRanges := strings.Split(serviceClusterRange, ",")
for _, serviceClusterRange := range serviceClusterRanges {
ip, ipnet, err := net.ParseCIDR(serviceClusterRange)
if err != nil {
return nil, fmt.Errorf("Failed to get kubernetes service IP from Kube API option [service_cluster_ip_range]: %v", err)
}
ip = ip.Mask(ipnet.Mask)
for j := len(ip) - 1; j >= 0; j-- {
ip[j]++
if ip[j] > 0 {
break
}
}
serviceIPs = append(serviceIPs, ip)
}
return ip, nil
return serviceIPs, nil
}
func GetLocalKubeConfig(configPath, configDir string) string {