Merge pull request #861 from AbsaOSS/cidr

Cleanup ClusterNetwork handling

Author: salasberryfin

pkg/rke2/config.go

@@ -21,7 +21,6 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"strings"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -208,11 +207,11 @@ func newRKE2ServerConfig(opts ServerConfigOpts) (*ServerConfig, []bootstrapv1.Fi
 	}
 
 	if len(opts.Cluster.Spec.ClusterNetwork.Pods.CIDRBlocks) > 0 {
-		rke2ServerConfig.ClusterCIDR = strings.Join(opts.Cluster.Spec.ClusterNetwork.Pods.CIDRBlocks, ",")
+		rke2ServerConfig.ClusterCIDR = opts.Cluster.Spec.ClusterNetwork.Pods.String()
 	}
 
 	if len(opts.Cluster.Spec.ClusterNetwork.Services.CIDRBlocks) > 0 {
-		rke2ServerConfig.ServiceCIDR = strings.Join(opts.Cluster.Spec.ClusterNetwork.Services.CIDRBlocks, ",")
+		rke2ServerConfig.ServiceCIDR = opts.Cluster.Spec.ClusterNetwork.Services.String()
 	}
 
 	rke2ServerConfig.BindAddress = opts.ServerConfig.BindAddress

pkg/rke2/config_test.go

@@ -20,6 +20,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -336,6 +337,8 @@ var _ = Describe("RKE2 Server Config with secretbox encryption", func() {
 		Expect(err).ToNot(HaveOccurred())
 
 		Expect(rke2ServerConfig.SecretsEncryptionProvider).To(Equal("secretbox"))
+		Expect(rke2ServerConfig.ServiceCIDR).To(Equal("192.169.0.0/16"))
+		Expect(rke2ServerConfig.ClusterCIDR).To(Equal("192.168.0.0/16"))
 		Expect(files[0].Content).To(Equal(expEncryptionConfig))
 	})
 })