Merge pull request #452 from simplysoft/fix/rke2-server-config-cidrs

Pass multiple CIDRs to RKE2 server config
rancher · Oct 24, 2024 · f1892ab · f1892ab
2 parents 28586d2 + 7fd28be
commit f1892ab
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/rke2/config.go b/pkg/rke2/config.go
@@ -19,6 +19,7 @@ package rke2
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -197,13 +198,13 @@ func newRKE2ServerConfig(opts ServerConfigOpts) (*ServerConfig, []bootstrapv1.Fi
 	if opts.Cluster.Spec.ClusterNetwork != nil &&
 		opts.Cluster.Spec.ClusterNetwork.Pods != nil &&
 		len(opts.Cluster.Spec.ClusterNetwork.Pods.CIDRBlocks) > 0 {
-		rke2ServerConfig.ClusterCIDR = opts.Cluster.Spec.ClusterNetwork.Pods.CIDRBlocks[0]
+		rke2ServerConfig.ClusterCIDR = strings.Join(opts.Cluster.Spec.ClusterNetwork.Pods.CIDRBlocks, ",")
 	}
 
 	if opts.Cluster.Spec.ClusterNetwork != nil &&
 		opts.Cluster.Spec.ClusterNetwork.Services != nil &&
 		len(opts.Cluster.Spec.ClusterNetwork.Services.CIDRBlocks) > 0 {
-		rke2ServerConfig.ServiceCIDR = opts.Cluster.Spec.ClusterNetwork.Services.CIDRBlocks[0]
+		rke2ServerConfig.ServiceCIDR = strings.Join(opts.Cluster.Spec.ClusterNetwork.Services.CIDRBlocks, ",")
 	}
 
 	rke2ServerConfig.BindAddress = opts.ServerConfig.BindAddress