Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions validation/provisioning/dualstack/k3s_custom_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -158,17 +157,6 @@ func TestCustomK3SDualstack(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(tt.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, k.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(k.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(k.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetCustomSchemaParams(tt.client, k.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/dualstack/k3s_node_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -142,17 +141,6 @@ func TestNodeDriverK3S(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(tt.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, k.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(k.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(k.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetProvisioningSchemaParams(tt.client, k.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/dualstack/rke2_custom_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -144,17 +143,6 @@ func TestCustomRKE2Dualstack(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(tt.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, r.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetCustomSchemaParams(tt.client, r.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/dualstack/rke2_node_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -129,17 +128,6 @@ func TestNodeDriverRKE2(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(tt.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, r.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetProvisioningSchemaParams(tt.client, r.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/ipv6/k3s_custom_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -157,17 +156,6 @@ func TestCustomK3SIPv6(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(tt.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, r.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetCustomSchemaParams(tt.client, r.cattleConfig)
Expand Down
11 changes: 0 additions & 11 deletions validation/provisioning/ipv6/k3s_node_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -151,16 +150,6 @@ func TestNodeDriverK3SIPv6(t *testing.T) {
err = pods.VerifyClusterPods(tt.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, r.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetProvisioningSchemaParams(tt.client, r.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/ipv6/rke2_custom_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -144,17 +143,6 @@ func TestCustomRKE2IPv6(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(tt.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, r.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetCustomSchemaParams(tt.client, r.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/ipv6/rke2_node_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -137,17 +136,6 @@ func TestNodeDriverRKE2IPv6(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(tt.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, r.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetProvisioningSchemaParams(tt.client, r.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/k3s/custom_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -118,17 +117,6 @@ func TestCustom(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(tt.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, k.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(k.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(k.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetCustomSchemaParams(tt.client, k.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/k3s/hardened_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/reports"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
cis "github.com/rancher/tests/validation/provisioning/resources/cisbenchmark"
Expand Down Expand Up @@ -147,17 +146,6 @@ func TestHardened(t *testing.T) {

logrus.Infof("Running CIS scan on cluster (%s)", cluster.Name)
cis.RunCISScan(tt.client, k.project.ClusterID, tt.scanProfileName)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, k.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(k.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(k.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetCustomSchemaParams(tt.client, k.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/k3s/node_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -118,17 +117,6 @@ func TestNodeDriver(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(tt.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, k.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(k.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(k.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetProvisioningSchemaParams(tt.client, k.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/rke2/cni_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/rancher/tests/actions/logging"
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -109,17 +108,6 @@ func TestCNI(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(r.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, r.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetProvisioningSchemaParams(tt.client, r.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/rke2/custom_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -126,17 +125,6 @@ func TestCustom(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(r.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, r.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetCustomSchemaParams(tt.client, r.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/rke2/hardened_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/reports"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
cis "github.com/rancher/tests/validation/provisioning/resources/cisbenchmark"
Expand Down Expand Up @@ -148,17 +147,6 @@ func TestHardened(t *testing.T) {

logrus.Infof("Running CIS scan on cluster (%s)", cluster.Name)
cis.RunCISScan(tt.client, r.project.ClusterID, tt.scanProfileName)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, r.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetCustomSchemaParams(tt.client, r.cattleConfig)
Expand Down
12 changes: 0 additions & 12 deletions validation/provisioning/rke2/node_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/rancher/tests/actions/provisioning"
"github.com/rancher/tests/actions/provisioninginput"
"github.com/rancher/tests/actions/qase"
"github.com/rancher/tests/actions/workloads"
"github.com/rancher/tests/actions/workloads/deployment"
"github.com/rancher/tests/actions/workloads/pods"
standard "github.com/rancher/tests/validation/provisioning/resources/standarduser"
Expand Down Expand Up @@ -125,17 +124,6 @@ func TestNodeDriver(t *testing.T) {
logrus.Infof("Verifying cluster pods (%s)", cluster.Name)
err = pods.VerifyClusterPods(r.client, cluster)
require.NoError(t, err)

workloadConfigs := new(workloads.Workloads)
operations.LoadObjectFromMap(workloads.WorkloadsConfigurationFileKey, r.cattleConfig, workloadConfigs)

logrus.Infof("Creating workloads (%s)", cluster.Name)
workloadConfigs, err = workloads.CreateWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)

logrus.Infof("Verifying workloads (%s)", cluster.Name)
_, err = workloads.VerifyWorkloads(r.client, cluster.Name, *workloadConfigs)
require.NoError(t, err)
})

params := provisioning.GetProvisioningSchemaParams(tt.client, r.cattleConfig)
Expand Down