remove redundant manifest files

tian-men · Sep 22, 2023 · 0b17932 · 0b17932
1 parent 9705abd
commit 0b17932
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 714 deletions.
diff --git a/internal/render/render_suit_test.go → internal/render/render_suite_test.go b/internal/render/render_suit_test.go → internal/render/render_suite_test.go
diff --git a/internal/render/render_test.go b/internal/render/render_test.go
@@ -21,13 +21,12 @@ import (
 	"os"
 	"path/filepath"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
 	"github.com/NVIDIA/gpu-operator/internal/render"
 	"github.com/NVIDIA/gpu-operator/internal/utils"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
 )
 
 type templateData struct {

diff --git a/internal/state/driver_test.go b/internal/state/driver_test.go
@@ -41,7 +41,8 @@ import (
 )
 
 const (
-	manifestResultDir = "./golden"
+	manifestDir       = "../../manifests"
+	manifestResultDir = "./testdata/golden"
 )
 
 func getYAMLString(objs []*unstructured.Unstructured) (string, error) {
@@ -66,7 +67,7 @@ func TestDriverRenderMinimal(t *testing.T) {
 		testName = "driver-minimal"
 	)
 
-	state, err := NewStateDriver(nil, nil, "./testdata")
+	state, err := NewStateDriver(nil, nil, manifestDir)
 	require.Nil(t, err)
 	stateDriver, ok := state.(*stateDriver)
 	require.True(t, ok)
@@ -95,7 +96,7 @@ func TestDriverRenderRDMA(t *testing.T) {
 		testName = "driver-rdma"
 	)
 
-	state, err := NewStateDriver(nil, nil, "./testdata")
+	state, err := NewStateDriver(nil, nil, manifestDir)
 	require.Nil(t, err)
 	stateDriver, ok := state.(*stateDriver)
 	require.True(t, ok)
@@ -177,7 +178,7 @@ func TestDriverRDMAHostMOFED(t *testing.T) {
 	const (
 		testName = "driver-rdma-hostmofed"
 	)
-	state, err := NewStateDriver(nil, nil, "./testdata")
+	state, err := NewStateDriver(nil, nil, manifestDir)
 	require.Nil(t, err)
 	stateDriver, ok := state.(*stateDriver)
 	require.True(t, ok)
@@ -207,7 +208,7 @@ func TestDriverRDMAHostMOFED(t *testing.T) {
 
 func TestDriverSpec(t *testing.T) {
 	// Construct a sample driver state manager
-	state, err := NewStateDriver(nil, nil, "./testdata")
+	state, err := NewStateDriver(nil, nil, manifestDir)
 	require.Nil(t, err)
 	stateDriver, ok := state.(*stateDriver)
 	require.True(t, ok)
@@ -285,7 +286,7 @@ func TestDriverGDS(t *testing.T) {
 		testName = "driver-gds"
 	)
 
-	state, err := NewStateDriver(nil, nil, "./testdata")
+	state, err := NewStateDriver(nil, nil, manifestDir)
 	require.Nil(t, err)
 	stateDriver, ok := state.(*stateDriver)
 	require.True(t, ok)
@@ -321,7 +322,7 @@ func TestDriverAdditionalConfigs(t *testing.T) {
 		testName = "driver-additional-configs"
 	)
 
-	state, err := NewStateDriver(nil, nil, "./testdata")
+	state, err := NewStateDriver(nil, nil, manifestDir)
 	require.Nil(t, err)
 	stateDriver, ok := state.(*stateDriver)
 	require.True(t, ok)
@@ -379,7 +380,7 @@ func TestDriverOpenshiftDriverToolkit(t *testing.T) {
 		toolkitImage = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fecaebc1d51b28bc3548171907e4d91823a031d7a6a694ab686999be2b4d867"
 	)
 
-	state, err := NewStateDriver(nil, nil, "./testdata")
+	state, err := NewStateDriver(nil, nil, manifestDir)
 	require.Nil(t, err)
 	stateDriver, ok := state.(*stateDriver)
 	require.True(t, ok)
@@ -423,7 +424,7 @@ func TestDriverPrecompiled(t *testing.T) {
 		rhcosVersion = "5.4.0-150-generic"
 	)
 
-	state, err := NewStateDriver(nil, nil, "./testdata")
+	state, err := NewStateDriver(nil, nil, manifestDir)
 	require.Nil(t, err)
 	stateDriver, ok := state.(*stateDriver)
 	require.True(t, ok)

diff --git a/internal/state/testdata/0100_service_account.yaml b/internal/state/testdata/0100_service_account.yaml
diff --git a/internal/state/testdata/0200_role.yaml b/internal/state/testdata/0200_role.yaml
diff --git a/internal/state/testdata/0210_clusterrole.yaml b/internal/state/testdata/0210_clusterrole.yaml
diff --git a/internal/state/testdata/0300_rolebinding.yaml b/internal/state/testdata/0300_rolebinding.yaml
diff --git a/internal/state/testdata/0310_clusterrolebinding.yaml b/internal/state/testdata/0310_clusterrolebinding.yaml
diff --git a/internal/state/testdata/0410_scc.openshift.yaml b/internal/state/testdata/0410_scc.openshift.yaml
diff --git a/internal/state/testdata/0420_proxycfg.openshift.yaml b/internal/state/testdata/0420_proxycfg.openshift.yaml