yaml: remove _NODE_[12]_ subst

Signed-off-by: Nathan Skrzypczak <[email protected]>
projectcalico · Oct 9, 2023 · d5fb500 · d5fb500
1 parent 8656efe
commit d5fb500
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 32 deletions.
diff --git a/test/scripts/test.sh b/test/scripts/test.sh
@@ -110,7 +110,7 @@ test_apply ()
   k_create_namespace $NAME
 
   export VPP_DATAPLANE_DIRECTORY=$VPP_DATAPLANE_DIRECTORY
-  sed -e "s/_NODE_1_/${NODES[0]}/" -e "s/_NODE_2_/${NODES[1]}/" $YAML_FILE | \
+  cat $YAML_FILE | \
 	envsubst | \
 	kubectl apply -f -
 }
@@ -128,7 +128,7 @@ test_delete ()
   	echo "${YAML_FILE} doesnt exist"
   	exit 1
   fi
-  sed -e "s/_NODE_1_/${NODES[0]}/" -e "s/_NODE_2_/${NODES[1]}/" $YAML_FILE | \
+  cat $YAML_FILE | \
 	kubectl delete -f -
   k_delete_namespace $1
 }

diff --git a/test/yaml/envoy/test.yaml b/test/yaml/envoy/test.yaml
@@ -23,7 +23,6 @@ spec:
       name: envoyyaml
     - mountPath: /etc/vpp/vcl.conf
       name: vclconf
-  nodeName: _NODE_1_
   volumes:
   - name: hostuser
     hostPath:
@@ -68,7 +67,6 @@ spec:
       name: hostuser
     - mountPath: /etc/envoy/envoy.yaml
       name: envoyyaml
-  nodeName: _NODE_1_
   volumes:
   - name: hostuser
     hostPath:

diff --git a/test/yaml/iperf/test.yaml b/test/yaml/iperf/test.yaml
@@ -29,7 +29,6 @@ spec:
           initialDelaySeconds: 3
           periodSeconds: 5
           timeoutSeconds: 3
-      nodeName: _NODE_1_
 ---
 apiVersion: apps/v1
 kind: ReplicaSet
@@ -61,7 +60,6 @@ spec:
           initialDelaySeconds: 3
           periodSeconds: 5
           timeoutSeconds: 3
-      nodeName: _NODE_1_
 ---
 apiVersion: v1
 kind: Service
@@ -193,7 +191,6 @@ spec:
     ports:
     - containerPort: 5001
     - containerPort: 5003
-  nodeName: _NODE_2_
 ---
 apiVersion: v1
 kind: Pod
@@ -208,4 +205,3 @@ spec:
     ports:
     - containerPort: 5001
     - containerPort: 5003
-  nodeName: _NODE_1_
diff --git a/test/yaml/iperf/test_single.yaml b/test/yaml/iperf/test_single.yaml
@@ -23,7 +23,6 @@ spec:
         ports:
         - containerPort: 5001
         - containerPort: 5003
-      nodeName: _NODE_1_
 ---
 apiVersion: v1
 kind: Service
@@ -54,4 +53,3 @@ spec:
     ports:
     - containerPort: 5001
     - containerPort: 5003
-  nodeName: _NODE_2_
diff --git a/test/yaml/iperf/test_v4.yaml b/test/yaml/iperf/test_v4.yaml
@@ -29,7 +29,6 @@ spec:
           initialDelaySeconds: 3
           periodSeconds: 5
           timeoutSeconds: 3
-      nodeName: _NODE_1_
 ---
 apiVersion: apps/v1
 kind: ReplicaSet
@@ -61,7 +60,6 @@ spec:
           initialDelaySeconds: 3
           periodSeconds: 5
           timeoutSeconds: 3
-      nodeName: _NODE_1_
 ---
 apiVersion: v1
 kind: Service
@@ -150,7 +148,6 @@ spec:
     ports:
     - containerPort: 5001
     - containerPort: 5003
-  nodeName: _NODE_2_
 ---
 apiVersion: v1
 kind: Pod
@@ -165,4 +162,3 @@ spec:
     ports:
     - containerPort: 5001
     - containerPort: 5003
-  nodeName: _NODE_1_
diff --git a/test/yaml/iperf/test_v6.yaml b/test/yaml/iperf/test_v6.yaml
@@ -29,7 +29,6 @@ spec:
           initialDelaySeconds: 3
           periodSeconds: 5
           timeoutSeconds: 3
-      nodeName: _NODE_1_
 ---
 apiVersion: apps/v1
 kind: ReplicaSet
@@ -61,7 +60,6 @@ spec:
           initialDelaySeconds: 3
           periodSeconds: 5
           timeoutSeconds: 3
-      nodeName: _NODE_1_
 ---
 apiVersion: v1
 kind: Service
@@ -151,7 +149,6 @@ spec:
     ports:
     - containerPort: 5001
     - containerPort: 5003
-  nodeName: _NODE_2_
 ---
 apiVersion: v1
 kind: Pod
@@ -166,4 +163,3 @@ spec:
     ports:
     - containerPort: 5001
     - containerPort: 5003
-  nodeName: _NODE_1_
diff --git a/test/yaml/iperf3-vcl/test.yaml b/test/yaml/iperf3-vcl/test.yaml
@@ -24,7 +24,6 @@ spec:
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 5201
-      nodeName: _NODE_1_
 ---
 apiVersion: v1
 kind: Service
@@ -52,7 +51,6 @@ spec:
     imagePullPolicy: IfNotPresent
     ports:
     - containerPort: 5201
-  nodeName: _NODE_2_
 ---
 apiVersion: v1
 kind: Pod
@@ -68,5 +66,3 @@ spec:
     imagePullPolicy: IfNotPresent
     ports:
     - containerPort: 5201
-  nodeName: _NODE_1_
-
diff --git a/test/yaml/iperf3/test.yaml b/test/yaml/iperf3/test.yaml
@@ -33,7 +33,6 @@ spec:
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 5201
-      nodeName: _NODE_1_
 
 ---
 apiVersion: v1
@@ -67,4 +66,3 @@ spec:
     imagePullPolicy: IfNotPresent
     ports:
     - containerPort: 5201
-  nodeName: _NODE_2_
diff --git a/test/yaml/metallb/test_metallb.yaml b/test/yaml/metallb/test_metallb.yaml
@@ -33,7 +33,6 @@ metadata:
 subsets:
   - addresses:
       - ip: 10.10.186.88
-        nodeName: node1
     ports:
       - port: 9376
 ---

diff --git a/test/yaml/nginx/test.yaml b/test/yaml/nginx/test.yaml
@@ -22,7 +22,6 @@ spec:
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80
-      nodeName: _NODE_1_
 ---
 apiVersion: v1
 kind: Service

diff --git a/test/yaml/scalepods/test.yaml b/test/yaml/scalepods/test.yaml
@@ -22,7 +22,6 @@ spec:
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80
-      nodeName: _NODE_1_
 ---
 apiVersion: v1
 kind: Service

diff --git a/test/yaml/simple-vcl/test.yaml b/test/yaml/simple-vcl/test.yaml
@@ -11,7 +11,6 @@ spec:
   - name: simple-client
     image: calicovpp/test-simple-vcl
     imagePullPolicy: IfNotPresent
-  nodeName: _NODE_2_
 ---
 apiVersion: v1
 kind: Pod
@@ -25,4 +24,3 @@ spec:
   - name: simple-client
     image: calicovpp/test-simple-vcl
     imagePullPolicy: IfNotPresent
-  nodeName: _NODE_1_
diff --git a/test/yaml/testpmd/test.yaml b/test/yaml/testpmd/test.yaml
@@ -24,7 +24,6 @@ spec:
     volumeMounts:
     - mountPath: /hugepages
       name: hugepage
-  nodeName: _NODE_1_
   volumes:
   - name: hugepage
     emptyDir:

diff --git a/test/yaml/trex/test.yaml b/test/yaml/trex/test.yaml
@@ -22,7 +22,6 @@ spec:
     volumeMounts:
     - mountPath: /hugepages
       name: hugepage
-  nodeName: _NODE_2_
   volumes:
   - name: hugepage
     emptyDir:

diff --git a/test/yaml/wrk/test.yaml b/test/yaml/wrk/test.yaml
@@ -10,5 +10,4 @@ spec:
     imagePullPolicy: IfNotPresent
     securityContext:
       privileged: true
-  nodeName: _NODE_2_
 ---