Merge pull request #5755 from nojnhuh/ipv6-conformance

Use ipv6 template for ipv6 conformance instead of default template

Author: k8s-ci-robot

docs/book/src/developers/development.md

@@ -545,7 +545,7 @@ Optional settings are:
 | `WINDOWS`            | `false`       | Run conformance against Windows nodes                                                              |
 | `CONFORMANCE_NODES`  | `1`           | Number of parallel ginkgo nodes to run                                                             |
 | `CONFORMANCE_FLAVOR` | `""`          | The flavor of the cluster to run conformance against. If not set, the default flavor will be used. |
-| `IP_FAMILY`          | `IPv4`        | Set to `IPv6` to run conformance against single-stack IPv6, or `dual` for dual-stack.              |
+| `IP_FAMILY`          | `ipv4`        | Set to `ipv6` to run conformance against single-stack IPv6, or `dual` for dual-stack.              |
 
 With the following environment variables defined, you can build a CAPZ cluster from the HEAD of Kubernetes main branch or release branch, and run the Conformance test suite against it.
 

test/e2e/config/azure-dev.yaml

@@ -233,7 +233,7 @@ variables:
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "${CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT:-1}"
   CONFORMANCE_IMAGE: "${CONFORMANCE_IMAGE:-}"
   CONFORMANCE_NODES: "${CONFORMANCE_NODES:-1}"
-  IP_FAMILY: "IPv4"
+  IP_FAMILY: "ipv4"
   CLUSTER_IDENTITY_NAME: "${CLUSTER_IDENTITY_NAME:-cluster-identity-ci}"
   ASO_CREDENTIAL_SECRET_NAME: "${ASO_CREDENTIAL_SECRET_NAME:-aso-credentials}"
   ASO_CREDENTIAL_SECRET_MODE: "${ASO_CREDENTIAL_SECRET_MODE:-workloadidentity}"

test/e2e/conformance_test.go

@@ -107,7 +107,7 @@ var _ = Describe("Conformance Tests", func() {
 				flavor = "conformance-presubmit-artifacts"
 			}
 			// use the ipv6 flavor if ipv6 IP family is specified.
-			if e2eConfig.MustGetVariable(capi_e2e.IPFamily) == "IPv6" {
+			if e2eConfig.MustGetVariable(capi_e2e.IPFamily) == "ipv6" {
 				flavor += "-ipv6"
 				kubetestConfigFilePath = strings.Replace(kubetestConfigFilePath, ".yaml", "-ipv6.yaml", 1)
 			} else if e2eConfig.MustGetVariable(capi_e2e.IPFamily) == "dual" {