Use IsIPv6CIDRString from k8s utils

olliewalsh · olliewalsh · commit 6fcf309b1762 · 2024-07-09T13:21:27.000+01:00
diff --git a/modules/common/ocp/ocp.go b/modules/common/ocp/ocp.go
@@ -18,14 +18,14 @@ package ocp
 
 import (
 	"context"
-	"strings"
 
 	"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
 
 	ocp_config "github.com/openshift/api/config/v1"
 	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+	k8s_utils "k8s.io/utils/net"
 )
 
 // IsFipsCluster - Check if OCP has fips enabled which is a day 1 operation
@@ -59,7 +59,7 @@ func HasIPv6ClusterNetwork(ctx context.Context, h *helper.Helper) (bool, error)
 	}
 
 	for _, clusterNetwork := range networkConfig.Status.ClusterNetwork {
-		if strings.Count(clusterNetwork.CIDR, ":") >= 2 {
+		if k8s_utils.IsIPv6CIDRString(clusterNetwork.CIDR) {
 			return true, nil
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,14 @@ package ocp`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"context"`
`21`		`- "strings"`
`22`	`21`
`23`	`22`	`"github.com/openstack-k8s-operators/lib-common/modules/common/helper"`
`24`	`23`
`25`	`24`	`ocp_config "github.com/openshift/api/config/v1"`
`26`	`25`	`"gopkg.in/yaml.v3"`
`27`	`26`	`corev1 "k8s.io/api/core/v1"`
`28`	`27`	`"k8s.io/apimachinery/pkg/types"`
	`28`	`+ k8s_utils "k8s.io/utils/net"`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`// IsFipsCluster - Check if OCP has fips enabled which is a day 1 operation`
`@@ -59,7 +59,7 @@ func HasIPv6ClusterNetwork(ctx context.Context, h *helper.Helper) (bool, error)`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`for _, clusterNetwork := range networkConfig.Status.ClusterNetwork {`
`62`		`- if strings.Count(clusterNetwork.CIDR, ":") >= 2 {`
	`62`	`+ if k8s_utils.IsIPv6CIDRString(clusterNetwork.CIDR) {`
`63`	`63`	`return true, nil`
`64`	`64`	`}`
`65`	`65`	`}`