remove more tests

kubernetes-sigs · Jan 25, 2022 · 19dbdd8 · 19dbdd8
1 parent 52517d0
commit 19dbdd8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 49 deletions.
diff --git a/api/internal/accumulator/namereferencetransformer_test.go b/api/internal/accumulator/namereferencetransformer_test.go
@@ -655,7 +655,6 @@ const (
 	ns2       = "ns2"
 	ns3       = "ns3"
 	ns4       = "ns4"
-	ns5       = "01234"
 
 	orgname      = "uniquename"
 	prefixedname = "prefix-uniquename"
@@ -689,13 +688,6 @@ func TestNameReferenceNamespace(t *testing.T) {
 				"name":      suffixedname,
 				"namespace": ns2,
 			}}).
-		AddWithNsAndName(ns5, orgname, map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name":      suffixedname,
-				"namespace": ns5,
-			}}).
 		// Add Secret with the same org name in noNs, "ns1" and "ns2" namespaces
 		AddWithNsAndName(defaultNs, orgname, map[string]interface{}{
 			"apiVersion": "v1",
@@ -718,24 +710,15 @@ func TestNameReferenceNamespace(t *testing.T) {
 				"name":      suffixedname,
 				"namespace": ns2,
 			}}).
-		AddWithNsAndName(ns5, orgname, map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "Secret",
-			"metadata": map[string]interface{}{
-				"name":      suffixedname,
-				"namespace": ns5,
-			}}).
 		// Add Deployment with the same org name in noNs, "ns1" and "ns2" namespaces
 		AddWithNsAndName(defaultNs, orgname, deploymentMap(defaultNs, modifiedname, modifiedname, modifiedname)).
 		AddWithNsAndName(ns1, orgname, deploymentMap(ns1, prefixedname, orgname, orgname)).
-		AddWithNsAndName(ns2, orgname, deploymentMap(ns2, suffixedname, orgname, orgname)).
-		AddWithNsAndName(ns5, orgname, deploymentMap(ns5, suffixedname, orgname, orgname)).ResMap()
+		AddWithNsAndName(ns2, orgname, deploymentMap(ns2, suffixedname, orgname, orgname)).ResMap()
 
 	expected := resmaptest_test.NewSeededRmBuilderDefault(t, m.ShallowCopy()).
 		ReplaceResource(deploymentMap(defaultNs, modifiedname, modifiedname, modifiedname)).
 		ReplaceResource(deploymentMap(ns1, prefixedname, prefixedname, prefixedname)).
-		ReplaceResource(deploymentMap(ns2, suffixedname, suffixedname, suffixedname)).
-		ReplaceResource(deploymentMap(ns5, suffixedname, suffixedname, suffixedname)).ResMap()
+		ReplaceResource(deploymentMap(ns2, suffixedname, suffixedname, suffixedname)).ResMap()
 
 	nrt := newNameReferenceTransformer(builtinconfig.MakeDefaultConfig().NameReference)
 	err := nrt.Transform(m)
@@ -775,13 +758,6 @@ func TestNameReferenceClusterWide(t *testing.T) {
 				"name":      suffixedname,
 				"namespace": ns2,
 			}}).
-		AddWithNsAndName(ns5, orgname, map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ServiceAccount",
-			"metadata": map[string]interface{}{
-				"name":      suffixedname,
-				"namespace": ns5,
-			}}).
 		// Add a PersistentVolume to have a clusterwide resource
 		AddWithName(orgname, map[string]interface{}{
 			"apiVersion": "v1",
@@ -832,11 +808,6 @@ func TestNameReferenceClusterWide(t *testing.T) {
 					"name":      orgname,
 					"namespace": ns2,
 				},
-				map[string]interface{}{
-					"kind":      "ServiceAccount",
-					"name":      orgname,
-					"namespace": ns5,
-				},
 				map[string]interface{}{
 					"kind":      "ServiceAccount",
 					"name":      orgname,
@@ -896,11 +867,6 @@ func TestNameReferenceClusterWide(t *testing.T) {
 						"name":      suffixedname,
 						"namespace": ns2,
 					},
-					map[string]interface{}{
-						"kind":      "ServiceAccount",
-						"name":      suffixedname,
-						"namespace": ns5,
-					},
 					map[string]interface{}{
 						"kind":      "ServiceAccount",
 						"name":      orgname,

diff --git a/api/internal/builtins/PrefixTransformer.go b/api/internal/builtins/PrefixTransformer.go
diff --git a/api/internal/builtins/SuffixTransformer.go b/api/internal/builtins/SuffixTransformer.go
diff --git a/api/internal/target/kusttarget_test.go b/api/internal/target/kusttarget_test.go
@@ -52,13 +52,11 @@ func TestLoad(t *testing.T) {
 		},
 		"simple": {
 			content: `
-namespace: "01234"
 commonLabels:
   app: nginx
 `,
 			k: types.Kustomization{
 				TypeMeta:     expectedTypeMeta,
-				Namespace:    "01234",
 				CommonLabels: map[string]string{"app": "nginx"},
 			},
 		},
@@ -68,13 +66,11 @@ commonLabels:
 # ...
 # yada yada yada.
 
-namespace: "01234"
 commonLabels:
  app: nginx
 `,
 			k: types.Kustomization{
 				TypeMeta:     expectedTypeMeta,
-				Namespace:    "01234",
 				CommonLabels: map[string]string{"app": "nginx"},
 			},
 		},
@@ -107,7 +103,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namePrefix: foo-
 nameSuffix: -bar
-namespace: "01234" 
+namespace: ns1
 commonLabels:
   app: nginx
 commonAnnotations:
@@ -146,7 +142,7 @@ kind: Deployment
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: "01234" 
+  name: ns1
 `)
 	th.WriteF("/whatever/jsonpatch.json", `[
     {"op": "add", "path": "/spec/replica", "value": "3"}
@@ -161,7 +157,7 @@ metadata:
 			"kind":       "Deployment",
 			"metadata": map[string]interface{}{
 				"name":      "foo-dply1-bar",
-				"namespace": "01234",
+				"namespace": "ns1",
 				"labels": map[string]interface{}{
 					"app": "nginx",
 				},
@@ -188,11 +184,11 @@ metadata:
 				},
 			},
 		}),
-		resFactory.FromMapWithName("01234", map[string]interface{}{
+		resFactory.FromMapWithName("ns1", map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "Namespace",
 			"metadata": map[string]interface{}{
-				"name": "01234",
+				"name": "ns1",
 				"labels": map[string]interface{}{
 					"app": "nginx",
 				},
@@ -207,7 +203,7 @@ metadata:
 				"kind":       "ConfigMap",
 				"metadata": map[string]interface{}{
 					"name":      "foo-literalConfigMap-bar-g5f6t456f5",
-					"namespace": "01234",
+					"namespace": "ns1",
 					"labels": map[string]interface{}{
 						"app": "nginx",
 					},
@@ -226,7 +222,7 @@ metadata:
 				"kind":       "Secret",
 				"metadata": map[string]interface{}{
 					"name":      "foo-secret-bar-82c2g5f8f6",
-					"namespace": "01234",
+					"namespace": "ns1",
 					"labels": map[string]interface{}{
 						"app": "nginx",
 					},