e2e: use PatchNamespace for regression test cases

burgerdev · burgerdev · commit 8ed029ce0fb8 · 2026-02-19T20:50:45.000+01:00
diff --git a/e2e/regression/regression_test.go b/e2e/regression/regression_test.go
@@ -10,7 +10,6 @@
 package regression
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"flag"
@@ -86,12 +85,12 @@ func TestRegression(t *testing.T) {
 			for _, file := range files {
 				resourceYAML, err := os.ReadFile(file)
 				require.NoError(err)
-				resourceYAML = bytes.ReplaceAll(resourceYAML, []byte("@@REPLACE_NAMESPACE@@"), []byte(ct.Namespace))
 
 				newResources, err := kuberesource.UnmarshalApplyConfigurations(resourceYAML)
 				require.NoError(err)
 
 				newResources = kuberesource.PatchRuntimeHandlers(newResources, runtimeHandler)
+				newResources = kuberesource.PatchNamespaces(newResources, ct.Namespace)
 				newResources = kuberesource.PatchNodeSelector(newResources)
 
 				// Check if we are testing a cron job
diff --git a/e2e/regression/testdata/apache-httpd-centos/apache-httpd-centos.yml b/e2e/regression/testdata/apache-httpd-centos/apache-httpd-centos.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: apache-httpd-centos
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   replicas: 1
   selector:
diff --git a/e2e/regression/testdata/apache-httpd-fedora/apache-httpd-fedora.yml b/e2e/regression/testdata/apache-httpd-fedora/apache-httpd-fedora.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: apache-httpd-fedora
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   # Test deploymentSpec fields support by genpolicy, set all defined fields.
   minReadySeconds: 10 # default is 0
diff --git a/e2e/regression/testdata/apache-httpd-pod/apache-httpd-pod.yml b/e2e/regression/testdata/apache-httpd-pod/apache-httpd-pod.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: apache-httpd-pod
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   containers:
     - name: httpd
diff --git a/e2e/regression/testdata/config-map-immutable/config-map-immutable.yml b/e2e/regression/testdata/config-map-immutable/config-map-immutable.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-map-immutable
-  namespace: "@@REPLACE_NAMESPACE@@"
 data:
   foo: bar
 immutable: true
diff --git a/e2e/regression/testdata/config-map/config-map.yml b/e2e/regression/testdata/config-map/config-map.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-map
-  namespace: "@@REPLACE_NAMESPACE@@"
 data:
   foo: bar
 binaryData:
@@ -12,7 +11,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: config-map
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   runtimeClassName: contrast-cc
   containers:
diff --git a/e2e/regression/testdata/cronjob/cronjob.yml b/e2e/regression/testdata/cronjob/cronjob.yml
@@ -2,7 +2,6 @@ apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cronjob
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   schedule: "* * * * *"
   concurrencyPolicy: Forbid
diff --git a/e2e/regression/testdata/daemonset/daemonset.yml b/e2e/regression/testdata/daemonset/daemonset.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: daemonset
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   selector:
     matchLabels:
diff --git a/e2e/regression/testdata/disruption-budget/disruption-budget.yml b/e2e/regression/testdata/disruption-budget/disruption-budget.yml
@@ -2,7 +2,6 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: disruption-budget
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   minAvailable: 0
   selector:
diff --git a/e2e/regression/testdata/ephemeral-volume/ephemeral-volume.yml b/e2e/regression/testdata/ephemeral-volume/ephemeral-volume.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ephemeral-volume
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   replicas: 1
   selector:
diff --git a/e2e/regression/testdata/job/job.yml b/e2e/regression/testdata/job/job.yml
@@ -2,7 +2,6 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: job
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   # Test jobSpec fields support by genpolicy, set all defined fields.
   activeDeadlineSeconds: 360 # default is nil
diff --git a/e2e/regression/testdata/keycloak/keycloak.yml b/e2e/regression/testdata/keycloak/keycloak.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: keycloak
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   replicas: 1
   selector:
diff --git a/e2e/regression/testdata/large-memory/large-memory.yml b/e2e/regression/testdata/large-memory/large-memory.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: large-memory
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   containers:
     - name: large-memory
diff --git a/e2e/regression/testdata/limit-range/limit-range.yml b/e2e/regression/testdata/limit-range/limit-range.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: LimitRange
 metadata:
   name: limit-range
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   limits:
     - default:
diff --git a/e2e/regression/testdata/memory-limit/memory-limit.yml b/e2e/regression/testdata/memory-limit/memory-limit.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: memory-limit
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   runtimeClassName: contrast-cc
   initContainers:
diff --git a/e2e/regression/testdata/mongodb/mongodb.yml b/e2e/regression/testdata/mongodb/mongodb.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mongodb
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   replicas: 1
   selector:
diff --git a/e2e/regression/testdata/mysql-centos/mysql-centos.yml b/e2e/regression/testdata/mysql-centos/mysql-centos.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mysql-centos
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   replicas: 1
   selector:
diff --git a/e2e/regression/testdata/mysql-fedora/mysql-fedora.yml b/e2e/regression/testdata/mysql-fedora/mysql-fedora.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mysql-fedora
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   replicas: 1
   selector:
diff --git a/e2e/regression/testdata/nginx/nginx.yml b/e2e/regression/testdata/nginx/nginx.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   replicas: 1
   selector:
@@ -39,7 +38,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: nginx-html
-  namespace: "@@REPLACE_NAMESPACE@@"
 data:
   index.html: |
     <h1>Hello World</h1>
diff --git a/e2e/regression/testdata/pod-secret-and-cm/cm.yml b/e2e/regression/testdata/pod-secret-and-cm/cm.yml
@@ -2,6 +2,5 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: cm
-  namespace: "@@REPLACE_NAMESPACE@@"
 data:
   CM_CONTENT: foobar
diff --git a/e2e/regression/testdata/pod-secret-and-cm/pod.yml b/e2e/regression/testdata/pod-secret-and-cm/pod.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: pod
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   runtimeClassName: contrast-cc
   containers:
diff --git a/e2e/regression/testdata/pod-secret-and-cm/secret.yml b/e2e/regression/testdata/pod-secret-and-cm/secret.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: secret
-  namespace: "@@REPLACE_NAMESPACE@@"
 type: Opaque
 data:
   SECRET_CONTENT: YmFyZm9v
diff --git a/e2e/regression/testdata/privileged-container/privileged-container.yml b/e2e/regression/testdata/privileged-container/privileged-container.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: privileged-container
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   containers:
     - name: privileged
diff --git a/e2e/regression/testdata/prometheus/prometheus.yml b/e2e/regression/testdata/prometheus/prometheus.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: prometheus
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   replicas: 1
   selector:
@@ -38,7 +37,6 @@ kind: Service
 metadata:
   # Ensure we accept RFC 1035 Label Names, see https://github.com/kata-containers/kata-containers/pull/11314
   name: prometheus-24
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   ports:
     - port: 9090
diff --git a/e2e/regression/testdata/redis/redis.yml b/e2e/regression/testdata/redis/redis.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: redis
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   replicas: 1
   selector:
diff --git a/e2e/regression/testdata/replicaset/replicaset.yml b/e2e/regression/testdata/replicaset/replicaset.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
   name: replicaset
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   replicas: 1
   selector:
diff --git a/e2e/regression/testdata/replication-controller/replication-controller.yml b/e2e/regression/testdata/replication-controller/replication-controller.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: replication-controller
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   replicas: 1
   selector:
diff --git a/e2e/regression/testdata/reused-layer/pod.yml b/e2e/regression/testdata/reused-layer/pod.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: reused-layers
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   initContainers:
     - name: init
diff --git a/e2e/regression/testdata/role/role.yml b/e2e/regression/testdata/role/role.yml
@@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: role
-  namespace: "@@REPLACE_NAMESPACE@@"
 rules:
   - apiGroups: [""]
     resources: ["pods"]
diff --git a/e2e/regression/testdata/rolebinding/rolebinding.yml b/e2e/regression/testdata/rolebinding/rolebinding.yml
@@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: rolebinding
-  namespace: "@@REPLACE_NAMESPACE@@"
 subjects:
   - kind: User
     name: root
diff --git a/e2e/regression/testdata/secret/secret.yml b/e2e/regression/testdata/secret/secret.yml
@@ -2,6 +2,5 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: secret
-  namespace: "@@REPLACE_NAMESPACE@@"
 data:
   foo: YmFyCg==
diff --git a/e2e/regression/testdata/service/service.yml b/e2e/regression/testdata/service/service.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: service
-  namespace: "@@REPLACE_NAMESPACE@@"
 spec:
   selector:
     app.kubernetes.io/name: foobar
diff --git a/e2e/regression/testdata/serviceaccount/serviceaccount.yml b/e2e/regression/testdata/serviceaccount/serviceaccount.yml
@@ -2,4 +2,3 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: serviceaccount
-  namespace: "@@REPLACE_NAMESPACE@@"
