deleting clusters

.github/actions/run-hostbusters-dualstack-test-suites/action.yaml

@@ -54,14 +54,29 @@ runs:
             fi
 
             gotestsum --format standard-verbose \
-              --packages=github.com/rancher/tests/validation/deleting/dualstack \
+              --packages=github.com/rancher/tests/validation/deleting/rke2/dualstack \
               --junitfile results.xml \
-              --jsonfile results_delete.json \
+              --jsonfile results_rke2_delete.json \
               -- -timeout=5h -tags=recurring -v
 
-            delete_exit=$?
-            echo "delete_exit=$delete_exit" >> "$GITHUB_ENV"
-            cp results_delete.json results.json
+            rke2_delete_exit=$?
+            echo "rke2_delete_exit=$rke2_delete_exit" >> "$GITHUB_ENV"
+            cp results_rke2_delete.json results.json
+
+            if [[ "${{ inputs.reporting }}" == "true" ]]; then
+              ./validation/pipeline/scripts/build_qase_reporter_v2.sh;
+              ./validation/reporter
+            fi
+
+            gotestsum --format standard-verbose \
+              --packages=github.com/rancher/tests/validation/deleting/k3s/dualstack \
+              --junitfile results.xml \
+              --jsonfile results_k3s_delete.json \
+              -- -timeout=5h -tags=recurring -v
+
+            k3s_delete_exit=$?
+            echo "k3s_delete_exit=$k3s_delete_exit" >> "$GITHUB_ENV"
+            cp results_k3s_delete.json results.json
 
             if [[ "${{ inputs.reporting }}" == "true" ]]; then
               ./validation/pipeline/scripts/build_qase_reporter_v2.sh;
@@ -153,7 +168,8 @@ runs:
         declare -A suites=(
           [k3s_cert_exit]="K3s Cert Rotation:results_k3s_cert.json"
           [rke2_cert_exit]="RKE2 Cert Rotation:results_rke2_cert.json"
-          [delete_exit]="Delete Cluster:results_delete.json"
+          [rke2_delete_exit]="Delete RKE2 Cluster:results_rke2_delete.json"
+          [k3s_delete_exit]="Delete K3S Cluster:results_k3s_delete.json"
           [node_scale_exit]="Node Scaling:results_node_scale.json"
           [prov_exit]="Provisioning:results_prov.json"
           [rke2_snapshot_exit]="RKE2 Snapshot Restore:results_rke2_snapshot.json"

.github/actions/run-hostbusters-ipv6-test-suites/action.yaml

@@ -54,14 +54,29 @@ runs:
             fi
 
             gotestsum --format standard-verbose \
-              --packages=github.com/rancher/tests/validation/deleting/ipv6 \
+              --packages=github.com/rancher/tests/validation/deleting/rke2/ipv6 \
               --junitfile results.xml \
-              --jsonfile results_delete.json \
+              --jsonfile results_rke2_delete.json \
               -- -timeout=5h -tags=recurring -v
 
-            delete_exit=$?
-            echo "delete_exit=$delete_exit" >> "$GITHUB_ENV"
-            cp results_delete.json results.json
+            rke2_delete_exit=$?
+            echo "rke2_delete_exit=$rke2_delete_exit" >> "$GITHUB_ENV"
+            cp results_rke2_delete.json results.json
+
+            if [[ "${{ inputs.reporting }}" == "true" ]]; then
+              ./validation/pipeline/scripts/build_qase_reporter_v2.sh;
+              ./validation/reporter
+            fi
+
+            gotestsum --format standard-verbose \
+              --packages=github.com/rancher/tests/validation/deleting/k3s/ipv6 \
+              --junitfile results.xml \
+              --jsonfile results_k3s_delete.json \
+              -- -timeout=5h -tags=recurring -v
+
+            k3s_delete_exit=$?
+            echo "k3s_delete_exit=$k3s_delete_exit" >> "$GITHUB_ENV"
+            cp results_k3s_delete.json results.json
 
             if [[ "${{ inputs.reporting }}" == "true" ]]; then
               ./validation/pipeline/scripts/build_qase_reporter_v2.sh;
@@ -153,7 +168,8 @@ runs:
         declare -A suites=(
           [k3s_cert_exit]="K3s Cert Rotation:results_k3s_cert.json"
           [rke2_cert_exit]="RKE2 Cert Rotation:results_rke2_cert.json"
-          [delete_exit]="Delete Cluster:results_delete.json"
+          [rke2_delete_exit]="Delete RKE2 Cluster:results_rke2_delete.json"
+          [k3s_delete_exit]="Delete K3S Cluster:results_k3s_delete.json"
           [node_scale_exit]="Node Scaling:results_node_scale.json"
           [prov_exit]="Provisioning:results_prov.json"
           [rke2_snapshot_exit]="RKE2 Snapshot Restore:results_rke2_snapshot.json"

.github/actions/run-hostbusters-test-suites/action.yaml

@@ -54,14 +54,29 @@ runs:
             fi
 
             gotestsum --format standard-verbose \
-              --packages=github.com/rancher/tests/validation/deleting/rke2k3s \
+              --packages=github.com/rancher/tests/validation/deleting/rke2 \
               --junitfile results.xml \
-              --jsonfile results_delete.json \
+              --jsonfile results_rke2_delete.json \
               -- -timeout=5h -tags=recurring -v
 
-            delete_exit=$?
-            echo "delete_exit=$delete_exit" >> "$GITHUB_ENV"
-            cp results_delete.json results.json
+            rke2_delete_exit=$?
+            echo "rke2_delete_exit=$rke2_delete_exit" >> "$GITHUB_ENV"
+            cp results_rke2_delete.json results.json
+
+            if [[ "${{ inputs.reporting }}" == "true" ]]; then
+              ./validation/pipeline/scripts/build_qase_reporter_v2.sh;
+              ./validation/reporter
+            fi
+
+            gotestsum --format standard-verbose \
+              --packages=github.com/rancher/tests/validation/deleting/k3s \
+              --junitfile results.xml \
+              --jsonfile results_k3s_delete.json \
+              -- -timeout=5h -tags=recurring -v
+
+            k3s_delete_exit=$?
+            echo "k3s_delete_exit=$k3s_delete_exit" >> "$GITHUB_ENV"
+            cp results_k3s_delete.json results.json
 
             if [[ "${{ inputs.reporting }}" == "true" ]]; then
               ./validation/pipeline/scripts/build_qase_reporter_v2.sh;
@@ -168,7 +183,8 @@ runs:
         declare -A suites=(
           [rke2_cert_exit]="RKE2 Cert Rotation:results_rke2_cert.json"
           [k3s_cert_exit]="K3S Cert Rotation:results_k3s_cert.json"
-          [delete_exit]="Delete Cluster:results_delete.json"
+          [rke2_delete_exit]="Delete RKE2 Cluster:results_rke2_delete.json"
+          [k3s_delete_exit]="Delete K3S Cluster:results_k3s_delete.json"
           [nodescaling_exit]="Node Scaling:results_node_scale.json"
           [k3s_exit]="K3S:results_k3s.json"
           [rke2_exit]="RKE2:results_rke2.json"

actions/clusters/clusters.go

@@ -14,7 +14,10 @@ import (
 	steveV1 "github.com/rancher/shepherd/clients/rancher/v1"
 	v1 "github.com/rancher/shepherd/clients/rancher/v1"
 	"github.com/rancher/shepherd/extensions/clusters"
+	"github.com/rancher/shepherd/extensions/defaults"
 	"github.com/rancher/shepherd/extensions/defaults/stevetypes"
+	"github.com/rancher/shepherd/extensions/steve"
+	"github.com/rancher/tests/actions/machinepools"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -25,11 +28,9 @@ const (
 	baseline              = "baseline"
 	externalAws           = "external-aws"
 	protectKernelDefaults = "protect-kernel-defaults"
-
-	localcluster      = "fleet-local/local"
-	rancherRestricted = "rancher-restricted"
-	rke1HardenedGID   = 52034
-	rke1HardenedUID   = 52034
+	rancherRestricted     = "rancher-restricted"
+	rke1HardenedGID       = 52034
+	rke1HardenedUID       = 52034
 )
 
 // CreateRancherBaselinePSACT creates custom PSACT called rancher-baseline which sets each PSS to baseline.
@@ -950,3 +951,30 @@ func DeletePSACT(client *rancher.Client, psactID string) error {
 
 	return nil
 }
+
+// DeleteInitMachine deletes the init machine from the specified cluster.
+func DeleteInitMachine(client *rancher.Client, clusterID string) error {
+	initMachine, err := machinepools.GetInitMachine(client, clusterID)
+	if err != nil {
+		return err
+	}
+
+	err = client.Steve.SteveType(stevetypes.Machine).Delete(initMachine)
+	if err != nil {
+		return err
+	}
+
+	logrus.Debugf("Waiting for the init machine to be deleted on cluster (%s)", clusterID)
+	err = steve.WaitForResourceDeletion(client.Steve, initMachine, defaults.FiveHundredMillisecondTimeout, defaults.TenMinuteTimeout)
+	if err != nil {
+		return err
+	}
+
+	logrus.Debugf("Waiting for the init machine to be replaced on cluster (%s)", clusterID)
+	err = clusters.WatchAndWaitForCluster(client, clusterID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

validation/certificates/k3s/README.md

@@ -73,7 +73,7 @@ rancher:
 ```
 
 ### Provisioning cluster
-This test will create a cluster if one is not provided, see to configure a node driver OR custom cluster depending on the snapshot test [k3s provisioning](../../provisioning/k3s/README.md)
+This test will create a cluster if one is not provided, see to configure a node driver OR custom cluster depending on the certificate test [k3s provisioning](../../provisioning/k3s/README.md)
 
 ## Defaults
 This package contains a defaults folder which contains default test configuration data for non-sensitive fields. The goal of this data is to: 

validation/certificates/k3s/dualstack/defaults/defaults.yaml

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

validation/certificates/rke2/README.md

@@ -91,7 +91,7 @@ rancher:
 ```
 
 ### Provisioning cluster
-This test will create a cluster if one is not provided, see to configure a node driver OR custom cluster depending on the snapshot test [rke2 provisioning](../../provisioning/rke2/README.md)
+This test will create a cluster if one is not provided, see to configure a node driver OR custom cluster depending on the certificate test [rke2 provisioning](../../provisioning/rke2/README.md)
 
 ## Defaults
 This package contains a defaults folder which contains default test configuration data for non-sensitive fields. The goal of this data is to: