rancher · susesgartner · Jan 24, 2026 · Jan 23, 2026
diff --git a/validation/certificates/k3s/cert_rotation_test.go b/validation/certificates/k3s/cert_rotation_test.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/rancher/shepherd/clients/rancher"
 	v1 "github.com/rancher/shepherd/clients/rancher/v1"
-	extClusters "github.com/rancher/shepherd/extensions/clusters"
 	"github.com/rancher/shepherd/extensions/defaults/stevetypes"
 	"github.com/rancher/shepherd/pkg/config"
 	"github.com/rancher/shepherd/pkg/config/operations"
@@ -74,7 +73,7 @@ func (c *CertRotationTestSuite) SetupSuite() {
 
 	if rancherConfig.ClusterName == "" {
 		logrus.Info("Provisioning K3S cluster")
-		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, extClusters.K3SClusterType.String(), provider, *clusterConfig, machineConfigSpec, nil, true, false)
+		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, defaults.K3S, provider, *clusterConfig, machineConfigSpec, nil, true, false)
 		require.NoError(c.T(), err)
 	} else {
 		logrus.Infof("Using existing cluster %s", rancherConfig.ClusterName)

diff --git a/...ation/certificates/defaults/defaults.yaml → ...n/certificates/k3s/defaults/defaults.yaml b/...ation/certificates/defaults/defaults.yaml → ...n/certificates/k3s/defaults/defaults.yaml
diff --git a/validation/certificates/k3s/dualstack/cert_rotation_test.go b/validation/certificates/k3s/dualstack/cert_rotation_test.go
@@ -6,10 +6,8 @@ import (
 	"os"
 	"testing"
 
-	rkev1 "github.com/rancher/rancher/pkg/apis/rke.cattle.io/v1"
 	"github.com/rancher/shepherd/clients/rancher"
 	v1 "github.com/rancher/shepherd/clients/rancher/v1"
-	extClusters "github.com/rancher/shepherd/extensions/clusters"
 	"github.com/rancher/shepherd/extensions/defaults/stevetypes"
 	"github.com/rancher/shepherd/pkg/config"
 	"github.com/rancher/shepherd/pkg/config/operations"
@@ -19,7 +17,6 @@ import (
 	"github.com/rancher/tests/actions/config/defaults"
 	"github.com/rancher/tests/actions/logging"
 	"github.com/rancher/tests/actions/provisioning"
-	"github.com/rancher/tests/actions/provisioninginput"
 	"github.com/rancher/tests/actions/qase"
 	"github.com/rancher/tests/actions/workloads/deployment"
 	"github.com/rancher/tests/actions/workloads/pods"
@@ -71,23 +68,12 @@ func (c *CertRotationDualstackTestSuite) SetupSuite() {
 	rancherConfig := new(rancher.Config)
 	operations.LoadObjectFromMap(defaults.RancherConfigKey, c.cattleConfig, rancherConfig)
 
-	clusterConfig.Advanced.MachineGlobalConfig.Data["flannel-ipv6-masq"] = true
 	if rancherConfig.ClusterName == "" {
 		provider := provisioning.CreateProvider(clusterConfig.Provider)
 		machineConfigSpec := provider.LoadMachineConfigFunc(c.cattleConfig)
 
-		if clusterConfig.Advanced == nil {
-			clusterConfig.Advanced = &provisioninginput.Advanced{}
-		}
-
-		if clusterConfig.Advanced.MachineGlobalConfig == nil {
-			clusterConfig.Advanced.MachineGlobalConfig = &rkev1.GenericMap{
-				Data: map[string]any{},
-			}
-		}
-
 		logrus.Info("Provisioning K3s cluster")
-		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, extClusters.K3SClusterType.String(), provider, *clusterConfig, machineConfigSpec, nil, true, false)
+		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, defaults.K3S, provider, *clusterConfig, machineConfigSpec, nil, true, false)
 		require.NoError(c.T(), err)
 	} else {
 		logrus.Infof("Using existing cluster %s", rancherConfig.ClusterName)

diff --git a/validation/certificates/k3s/ipv6/cert_rotation_test.go b/validation/certificates/k3s/ipv6/cert_rotation_test.go
@@ -6,10 +6,8 @@ import (
 	"os"
 	"testing"
 
-	rkev1 "github.com/rancher/rancher/pkg/apis/rke.cattle.io/v1"
 	"github.com/rancher/shepherd/clients/rancher"
 	v1 "github.com/rancher/shepherd/clients/rancher/v1"
-	extClusters "github.com/rancher/shepherd/extensions/clusters"
 	"github.com/rancher/shepherd/extensions/defaults/stevetypes"
 	"github.com/rancher/shepherd/pkg/config"
 	"github.com/rancher/shepherd/pkg/config/operations"
@@ -19,7 +17,6 @@ import (
 	"github.com/rancher/tests/actions/config/defaults"
 	"github.com/rancher/tests/actions/logging"
 	"github.com/rancher/tests/actions/provisioning"
-	"github.com/rancher/tests/actions/provisioninginput"
 	"github.com/rancher/tests/actions/qase"
 	"github.com/rancher/tests/actions/workloads/deployment"
 	"github.com/rancher/tests/actions/workloads/pods"
@@ -75,20 +72,8 @@ func (c *CertRotationIPv6TestSuite) SetupSuite() {
 		provider := provisioning.CreateProvider(clusterConfig.Provider)
 		machineConfigSpec := provider.LoadMachineConfigFunc(c.cattleConfig)
 
-		if clusterConfig.Advanced == nil {
-			clusterConfig.Advanced = &provisioninginput.Advanced{}
-		}
-
-		if clusterConfig.Advanced.MachineGlobalConfig == nil {
-			clusterConfig.Advanced.MachineGlobalConfig = &rkev1.GenericMap{
-				Data: map[string]any{},
-			}
-		}
-
-		clusterConfig.Advanced.MachineGlobalConfig.Data["flannel-ipv6-masq"] = true
-
 		logrus.Info("Provisioning K3s cluster")
-		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, extClusters.K3SClusterType.String(), provider, *clusterConfig, machineConfigSpec, nil, true, false)
+		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, defaults.K3S, provider, *clusterConfig, machineConfigSpec, nil, true, false)
 		require.NoError(c.T(), err)
 	} else {
 		logrus.Infof("Using existing cluster %s", rancherConfig.ClusterName)

diff --git a/validation/certificates/k3s/ipv6/defaults/defaults.yaml b/validation/certificates/k3s/ipv6/defaults/defaults.yaml
@@ -4,6 +4,9 @@ clusterConfig:
     clusterCIDR: "<required>"
     serviceCIDR: "<required>"
     stackPreference: "<required>"
+  advanced:
+    machineGlobalConfig:
+      flannel-ipv6-masq: true
 
 awsMachineConfigs:
   awsMachineConfig:

diff --git a/validation/certificates/rke2/cert_rotation_test.go b/validation/certificates/rke2/cert_rotation_test.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/rancher/shepherd/clients/rancher"
 	v1 "github.com/rancher/shepherd/clients/rancher/v1"
-	extClusters "github.com/rancher/shepherd/extensions/clusters"
 	"github.com/rancher/shepherd/extensions/defaults/stevetypes"
 	"github.com/rancher/shepherd/pkg/config"
 	"github.com/rancher/shepherd/pkg/config/operations"
@@ -74,7 +73,7 @@ func (c *CertRotationTestSuite) SetupSuite() {
 		machineConfigSpec := provider.LoadMachineConfigFunc(c.cattleConfig)
 
 		logrus.Info("Provisioning RKE2 cluster")
-		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, extClusters.RKE2ClusterType.String(), provider, *clusterConfig, machineConfigSpec, nil, true, false)
+		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, defaults.RKE2, provider, *clusterConfig, machineConfigSpec, nil, true, false)
 		require.NoError(c.T(), err)
 	} else {
 		logrus.Infof("Using existing cluster %s", rancherConfig.ClusterName)

diff --git a/validation/certificates/rke2/cert_rotation_wins_test.go b/validation/certificates/rke2/cert_rotation_wins_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/rancher/shepherd/clients/ec2"
 	"github.com/rancher/shepherd/clients/rancher"
 	v1 "github.com/rancher/shepherd/clients/rancher/v1"
-	extClusters "github.com/rancher/shepherd/extensions/clusters"
 	"github.com/rancher/shepherd/extensions/defaults/providers"
 	"github.com/rancher/shepherd/extensions/defaults/stevetypes"
 	"github.com/rancher/shepherd/pkg/config"
@@ -98,7 +97,7 @@ func (c *CertRotationWindowsTestSuite) SetupSuite() {
 		machineConfigSpec := provider.LoadMachineConfigFunc(c.cattleConfig)
 
 		logrus.Info("Provisioning RKE2 windows cluster")
-		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, extClusters.RKE2ClusterType.String(), provider, *clusterConfig, machineConfigSpec, awsEC2Configs, true, false)
+		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, defaults.RKE2, provider, *clusterConfig, machineConfigSpec, awsEC2Configs, true, false)
 		require.NoError(c.T(), err)
 	} else {
 		logrus.Infof("Using existing cluster %s", rancherConfig.ClusterName)

diff --git a/validation/certificates/rke2/defaults/defaults.yaml b/validation/certificates/rke2/defaults/defaults.yaml
@@ -0,0 +1,58 @@
+#Required for all tests
+rancher:
+  host: "<required>"
+  adminToken: "<required>"
+  insecure: true
+  cleanup: true
+
+#Required for all tests except template
+clusterConfig:
+  machinePools:
+  - machinePoolConfig:
+      etcd: true
+      controlplane: false
+      worker: false
+      quantity: 1
+  - machinePoolConfig:
+      etcd: false
+      controlplane: true
+      worker: false
+      quantity: 1
+  - machinePoolConfig:
+      etcd: false
+      controlplane: false
+      worker: true
+      quantity: 1
+  kubernetesVersion: ""
+  cni: "calico"
+  provider: "aws"
+  nodeProvider: "ec2"
+
+#Required for all tests
+awsCredentials:
+  secretKey: "<required>"
+  accessKey: "<required>"
+  defaultRegion: "us-east-2" 
+
+#Required for tests that utilize node driver clusters
+awsMachineConfigs:
+  region: "us-east-2"
+  awsMachineConfig:
+  - roles: ["etcd","controlplane","worker"]
+    ami: "<required>"
+    instanceType: "t3a.medium"
+    sshUser: "<required>"
+    vpcId: "<required>"
+    retries: "5"
+  - roles: ["windows"]
+    ami: "<required>"
+    instanceType: "t2.2xlarge"
+    sshUser: "<required>"
+    vpcId: "<required>"
+    volumeType: "<required>"
+    zone: "a"
+    retries: "5"
+    rootSize: "100"
+
+logging:
+   level: "info"
diff --git a/validation/certificates/rke2/dualstack/cert_rotation_test.go b/validation/certificates/rke2/dualstack/cert_rotation_test.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/rancher/shepherd/clients/rancher"
 	v1 "github.com/rancher/shepherd/clients/rancher/v1"
-	extClusters "github.com/rancher/shepherd/extensions/clusters"
 	"github.com/rancher/shepherd/extensions/defaults/stevetypes"
 	"github.com/rancher/shepherd/pkg/config"
 	"github.com/rancher/shepherd/pkg/config/operations"
@@ -74,7 +73,7 @@ func (c *CertRotationDualstackTestSuite) SetupSuite() {
 		machineConfigSpec := provider.LoadMachineConfigFunc(c.cattleConfig)
 
 		logrus.Info("Provisioning RKE2 cluster")
-		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, extClusters.RKE2ClusterType.String(), provider, *clusterConfig, machineConfigSpec, nil, true, false)
+		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, defaults.RKE2, provider, *clusterConfig, machineConfigSpec, nil, true, false)
 		require.NoError(c.T(), err)
 	} else {
 		logrus.Infof("Using existing cluster %s", rancherConfig.ClusterName)

diff --git a/validation/certificates/rke2/ipv6/cert_rotation_test.go b/validation/certificates/rke2/ipv6/cert_rotation_test.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/rancher/shepherd/clients/rancher"
 	v1 "github.com/rancher/shepherd/clients/rancher/v1"
-	extClusters "github.com/rancher/shepherd/extensions/clusters"
 	"github.com/rancher/shepherd/extensions/defaults/stevetypes"
 	"github.com/rancher/shepherd/pkg/config"
 	"github.com/rancher/shepherd/pkg/config/operations"
@@ -74,7 +73,7 @@ func (c *CertRotationIPv6TestSuite) SetupSuite() {
 		machineConfigSpec := provider.LoadMachineConfigFunc(c.cattleConfig)
 
 		logrus.Info("Provisioning RKE2 cluster")
-		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, extClusters.RKE2ClusterType.String(), provider, *clusterConfig, machineConfigSpec, nil, true, false)
+		c.cluster, err = resources.ProvisionRKE2K3SCluster(c.T(), standardUserClient, defaults.RKE2, provider, *clusterConfig, machineConfigSpec, nil, true, false)
 		require.NoError(c.T(), err)
 	} else {
 		logrus.Infof("Using existing cluster %s", rancherConfig.ClusterName)

diff --git a/validation/nodescaling/dualstack/defaults/defaults.yaml b/validation/nodescaling/dualstack/defaults/defaults.yaml
@@ -4,7 +4,10 @@ clusterConfig:
     clusterCIDR: "<required>"
     serviceCIDR: "<required>"
     stackPreference: "<required>"
-
+  advanced:
+    machineGlobalConfig:
+      flannel-ipv6-masq: true
+
 awsMachineConfigs:
   awsMachineConfig:
   - enablePrimaryIPv6: true

diff --git a/validation/nodescaling/ipv6/defaults/defaults.yaml b/validation/nodescaling/ipv6/defaults/defaults.yaml
@@ -4,6 +4,9 @@ clusterConfig:
     clusterCIDR: "<required>"
     serviceCIDR: "<required>"
     stackPreference: "<required>"
+  advanced:
+    machineGlobalConfig:
+      flannel-ipv6-masq: true
 
 awsMachineConfigs:
   awsMachineConfig:

diff --git a/validation/nodescaling/ipv6/scaling_test.go b/validation/nodescaling/ipv6/scaling_test.go
@@ -6,7 +6,6 @@ import (
 	"os"
 	"testing"
 
-	rkev1 "github.com/rancher/rancher/pkg/apis/rke.cattle.io/v1"
 	"github.com/rancher/shepherd/clients/rancher"
 	v1 "github.com/rancher/shepherd/clients/rancher/v1"
 	extClusters "github.com/rancher/shepherd/extensions/clusters"
@@ -19,7 +18,6 @@ import (
 	"github.com/rancher/tests/actions/logging"
 	"github.com/rancher/tests/actions/machinepools"
 	"github.com/rancher/tests/actions/provisioning"
-	"github.com/rancher/tests/actions/provisioninginput"
 	"github.com/rancher/tests/actions/qase"
 	"github.com/rancher/tests/actions/workloads/deployment"
 	"github.com/rancher/tests/actions/workloads/pods"
@@ -77,18 +75,6 @@ func (s *NodeScalingIPv6TestSuite) SetupSuite() {
 	s.rke2Cluster, err = resources.ProvisionRKE2K3SCluster(s.T(), standardUserClient, extClusters.RKE2ClusterType.String(), provider, *clusterConfig, machineConfigSpec, nil, true, false)
 	require.NoError(s.T(), err)
 
-	if clusterConfig.Advanced == nil {
-		clusterConfig.Advanced = &provisioninginput.Advanced{}
-	}
-
-	if clusterConfig.Advanced.MachineGlobalConfig == nil {
-		clusterConfig.Advanced.MachineGlobalConfig = &rkev1.GenericMap{
-			Data: map[string]any{},
-		}
-	}
-
-	clusterConfig.Advanced.MachineGlobalConfig.Data["flannel-ipv6-masq"] = true
-
 	logrus.Info("Provisioning K3s cluster")
 	s.k3sCluster, err = resources.ProvisionRKE2K3SCluster(s.T(), standardUserClient, extClusters.K3SClusterType.String(), provider, *clusterConfig, machineConfigSpec, nil, true, false)
 	require.NoError(s.T(), err)

@@ -4,7 +4,10 @@ clusterConfig:
     clusterCIDR: "<required>"
     serviceCIDR: "<required>"
     stackPreference: "<required>"
-
+  advanced:
+    machineGlobalConfig:
+      flannel-ipv6-masq: true
+
 awsMachineConfigs:
   awsMachineConfig:
   - enablePrimaryIPv6: true

@@ -6,7 +6,6 @@ import (
 	"os"
 	"testing"
 
-	rkev1 "github.com/rancher/rancher/pkg/apis/rke.cattle.io/v1"
 	"github.com/rancher/shepherd/clients/ec2"
 	"github.com/rancher/shepherd/clients/rancher"
 	"github.com/rancher/shepherd/pkg/config"
@@ -123,18 +122,6 @@ func TestCustomK3SDualstack(t *testing.T) {
 		clusterConfig.MachinePools = tt.machinePools
 		clusterConfig.Networking = tt.networking
 
-		if clusterConfig.Advanced == nil {
-			clusterConfig.Advanced = &provisioninginput.Advanced{}
-		}
-
-		if clusterConfig.Advanced.MachineGlobalConfig == nil {
-			clusterConfig.Advanced.MachineGlobalConfig = &rkev1.GenericMap{
-				Data: map[string]any{},
-			}
-		}
-
-		clusterConfig.Advanced.MachineGlobalConfig.Data["flannel-ipv6-masq"] = true
-
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 

@@ -6,7 +6,6 @@ import (
 	"os"
 	"testing"
 
-	rkev1 "github.com/rancher/rancher/pkg/apis/rke.cattle.io/v1"
 	"github.com/rancher/shepherd/clients/rancher"
 	"github.com/rancher/shepherd/extensions/cloudcredentials"
 	"github.com/rancher/shepherd/pkg/config"
@@ -111,18 +110,6 @@ func TestNodeDriverK3S(t *testing.T) {
 			clusterConfig.MachinePools = tt.machinePools
 			clusterConfig.Networking = tt.networking
 
-			if clusterConfig.Advanced == nil {
-				clusterConfig.Advanced = &provisioninginput.Advanced{}
-			}
-
-			if clusterConfig.Advanced.MachineGlobalConfig == nil {
-				clusterConfig.Advanced.MachineGlobalConfig = &rkev1.GenericMap{
-					Data: map[string]any{},
-				}
-			}
-
-			clusterConfig.Advanced.MachineGlobalConfig.Data["flannel-ipv6-masq"] = true
-
 			provider := provisioning.CreateProvider(clusterConfig.Provider)
 			credentialSpec := cloudcredentials.LoadCloudCredential(string(provider.Name))
 			machineConfigSpec := provider.LoadMachineConfigFunc(k.cattleConfig)

@@ -4,7 +4,10 @@ clusterConfig:
     clusterCIDR: "<required>"
     serviceCIDR: "<required>"
     stackPreference: "<required>"
-
+  advanced:
+    machineGlobalConfig:
+      flannel-ipv6-masq: true
+
 awsMachineConfigs:
   awsMachineConfig:
   - enablePrimaryIPv6: true