Move pod template from supplier app back to example

Signed-off-by: Danil Uzlov <DanilUzlov@yandex.ru>

apps/nse-supplier-k8s/kustomization.yaml

@@ -5,8 +5,3 @@ kind: Kustomization
 resources:
   - supplier.yaml
   - role.yaml
-
-configMapGenerator:
-  - name: supplier-pod-template-configmap
-    files:
-      - pod-template.yaml

apps/nse-supplier-k8s/supplier.yaml

@@ -27,18 +27,13 @@ spec:
                   fieldPath: metadata.name
             - name: NSE_CONNECT_TO
               value: unix:///var/lib/networkservicemesh/nsm.io.sock
-            - name: NSE_POD_DESCRIPTION_FILE
-              value: /run/supplier/pod-template.yaml
           volumeMounts:
             - name: spire-agent-socket
               mountPath: /run/spire/sockets
               readOnly: true
             - name: nsm-socket
               mountPath: /var/lib/networkservicemesh
               readOnly: true
-            - name: pod-file
-              mountPath: /run/supplier
-              readOnly: true
           resources:
             limits:
               memory: 40Mi
@@ -52,6 +47,3 @@ spec:
           hostPath:
             path: /var/lib/networkservicemesh
             type: DirectoryOrCreate
-        - name: pod-file
-          configMap:
-            name: supplier-pod-template-configmap

examples/features/scale-from-zero/README.md

@@ -39,7 +39,7 @@ kubectl exec -n spire spire-server-0 -- \
 NODES=($(kubectl get nodes -o go-template='{{range .items}}{{ if not .spec.taints }}{{ .metadata.name }} {{end}}{{end}}'))
 NSC_NODE=${NODES[0]}
 SUPPLIER_NODE=${NODES[1]}
-if [ "$SUPPLIER_NODE" == "" ]; then SUPPLIER_NODE=$NSC_NODE; fi
+if [ "$SUPPLIER_NODE" == "" ]; then SUPPLIER_NODE=$NSC_NODE; echo "Only 1 node found, testing that pod is created on the same node is useless"; fi
 ```
 
 4. Create patch for NSC:
@@ -87,6 +87,16 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: NSE_POD_DESCRIPTION_FILE
+              value: /run/supplier/pod-template.yaml
+          volumeMounts:
+            - name: pod-file
+              mountPath: /run/supplier
+              readOnly: true
+      volumes:
+        - name: pod-file
+          configMap:
+            name: supplier-pod-template-configmap
 EOF
 ```
 
@@ -106,6 +116,11 @@ bases:
 patchesStrategicMerge:
 - patch-nsc.yaml
 - patch-supplier.yaml
+
+configMapGenerator:
+  - name: supplier-pod-template-configmap
+    files:
+      - pod-template.yaml
 EOF
 ```
 

examples/features/scale-from-zero/patch-template.yaml

@@ -0,0 +1,20 @@
+---
+apiVersion: apps/v1
+kind: Pod
+metadata:
+  name: nse-icmp-responder
+  labels:
+    app: nse-icmp-responder
+spec:
+  restartPolicy: Never
+  containers:
+    - name: nse-icmp-responder
+      env:
+        - name: NSE_CIDR_PREFIX
+          value: 169.254.0.0/16
+        - name: NSE_SERVICE_NAME
+          value: autoscale-icmp-responder
+        - name: NSE_LABELS
+          value: app:nse-icmp-responder
+        - name: NSE_IDLE_TIMEOUT
+          value: 15s