Merge pull request #3663 from Mixaster995/use-annotations

Added usage of annotations for kernel clients
networkservicemesh · Nov 30, 2021 · e0ed205 · e0ed205
2 parents d5b90b8 + 2fa37e2
commit e0ed205
Show file tree

Hide file tree

Showing 17 changed files with 235 additions and 208 deletions.
diff --git a/apps/admission-webhook-k8s/admission-webhook.yaml b/apps/admission-webhook-k8s/admission-webhook.yaml
@@ -43,3 +43,5 @@ spec:
               value: ghcr.io/networkservicemesh/ci/cmd-nsc:96ccc8a
             - name: NSM_INIT_CONTAINER_IMAGES
               value: ghcr.io/networkservicemesh/ci/cmd-nsc-init:3dc57ef
+            - name: NSM_LABELS
+              value: spiffe.io/spiffe-id:true
diff --git a/examples/basic/README.md b/examples/basic/README.md
@@ -34,6 +34,13 @@ kubectl create ns nsm-system
 kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=5012a8aafd293534e2a9d98903f6d339ef44ceab
 ```
 
+3. Wait for admission-webhook-k8s:
+
+```bash
+WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
+kubectl wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system
+```
+
 ## Cleanup
 
 To free resouces follow the next command:

diff --git a/examples/features/dns/README.md b/examples/features/dns/README.md
@@ -9,12 +9,6 @@ Make sure that you have completed steps from [features](../)
 
 ## Run
 
-Note: Admission webhook is required and should be started at this moment.
-```bash
-WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
-kubectl wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system
-```
-
 1. Create test namespace:
 ```bash
 NAMESPACE=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/5012a8aafd293534e2a9d98903f6d339ef44ceab/examples/features/namespace.yaml)[0])

diff --git a/examples/features/ipv6/Kernel2Kernel/README.md b/examples/features/ipv6/Kernel2Kernel/README.md
@@ -27,37 +27,39 @@ kind: Kustomization
 
 namespace: ${NAMESPACE}
 
+resources: 
+- client.yaml
 bases:
-- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=5012a8aafd293534e2a9d98903f6d339ef44ceab
 - https://github.com/networkservicemesh/deployments-k8s/apps/nse-kernel?ref=5012a8aafd293534e2a9d98903f6d339ef44ceab
 
 patchesStrategicMerge:
-- patch-nsc.yaml
 - patch-nse.yaml
 EOF
 ```
 
-Create NSC patch:
+Create Client:
 ```bash
-cat > patch-nsc.yaml <<EOF
+cat > client.yaml <<EOF
 ---
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: v1
+kind: Pod
 metadata:
-  name: nsc-kernel
+  name: alpine
+  labels:
+    app: alpine    
+  annotations:
+    networkservicemesh.io: kernel://icmp-responder/nsm-1
 spec:
-  template:
-    spec:
-      containers:
-        - name: nsc
-          env:
-            - name: NSM_NETWORK_SERVICES
-              value: kernel://icmp-responder/nsm-1
-      nodeSelector:
-        kubernetes.io/hostname: ${NODE}
+  containers:
+  - name: alpine
+    image: alpine:3.15.0
+    imagePullPolicy: IfNotPresent
+    stdin: true
+    tty: true
+  nodeSelector:
+    kubernetes.io/hostname: ${NODE}
 EOF
 ```
-
 Create NSE patch:
 ```bash
 cat > patch-nse.yaml <<EOF
@@ -86,15 +88,15 @@ kubectl apply -k .
 
 Wait for applications ready:
 ```bash
-kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ${NAMESPACE}
+kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ${NAMESPACE}
 ```
 ```bash
 kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ${NAMESPACE}
 ```
 
 Find NSC and NSE pods by labels:
 ```bash
-NSC=$(kubectl get pods -l app=nsc-kernel -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
+NSC=$(kubectl get pods -l app=alpine -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
 ```
 ```bash
 NSE=$(kubectl get pods -l app=nse-kernel -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')

diff --git a/examples/features/ipv6/Kernel2Wireguard2Kernel/README.md b/examples/features/ipv6/Kernel2Wireguard2Kernel/README.md
@@ -27,37 +27,38 @@ kind: Kustomization
 
 namespace: ${NAMESPACE}
 
+resources: 
+- client.yaml
 bases:
-- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=5012a8aafd293534e2a9d98903f6d339ef44ceab
 - https://github.com/networkservicemesh/deployments-k8s/apps/nse-kernel?ref=5012a8aafd293534e2a9d98903f6d339ef44ceab
 
 patchesStrategicMerge:
-- patch-nsc.yaml
 - patch-nse.yaml
 EOF
 ```
 
-Create NSC patch:
+Create Client:
 ```bash
-cat > patch-nsc.yaml <<EOF
+cat > client.yaml <<EOF
 ---
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: v1
+kind: Pod
 metadata:
-  name: nsc-kernel
+  name: alpine
+  labels:
+    app: alpine    
+  annotations:
+    networkservicemesh.io: kernel://icmp-responder-ip/nsm-1
 spec:
-  template:
-    spec:
-      containers:
-        - name: nsc
-          env:
-            - name: NSM_NETWORK_SERVICES
-              value: kernel://icmp-responder-ip/nsm-1
-
-      nodeSelector:
-        kubernetes.io/hostname: ${NODES[0]}
+  containers:
+  - name: alpine
+    image: alpine:3.15.0
+    imagePullPolicy: IfNotPresent
+    stdin: true
+    tty: true
+  nodeSelector:
+    kubernetes.io/hostname: ${NODES[0]}
 EOF
-
 ```
 Create NSE patch:
 ```bash
@@ -91,15 +92,15 @@ kubectl apply -k .
 
 Wait for applications ready:
 ```bash
-kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ${NAMESPACE}
+kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ${NAMESPACE}
 ```
 ```bash
 kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ${NAMESPACE}
 ```
 
 Find NSC and NSE pods by labels:
 ```bash
-NSC=$(kubectl get pods -l app=nsc-kernel -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
+NSC=$(kubectl get pods -l app=alpine -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
 ```
 ```bash
 NSE=$(kubectl get pods -l app=nse-kernel -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')

diff --git a/examples/features/ipv6/Kernel2Wireguard2Memif/README.md b/examples/features/ipv6/Kernel2Wireguard2Memif/README.md
@@ -28,37 +28,40 @@ kind: Kustomization
 
 namespace: ${NAMESPACE}
 
+resources: 
+- client.yaml
 bases:
-- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=5012a8aafd293534e2a9d98903f6d339ef44ceab
 - https://github.com/networkservicemesh/deployments-k8s/apps/nse-memif?ref=5012a8aafd293534e2a9d98903f6d339ef44ceab
 
 patchesStrategicMerge:
-- patch-nsc.yaml
 - patch-nse.yaml
 EOF
 ```
 
-Create NSC patch:
+Create Client:
 ```bash
-cat > patch-nsc.yaml <<EOF
+cat > client.yaml <<EOF
 ---
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: v1
+kind: Pod
 metadata:
-  name: nsc-kernel
+  name: alpine
+  labels:
+    app: alpine    
+  annotations:
+    networkservicemesh.io: kernel://icmp-responder-ip/nsm-1
 spec:
-  template:
-    spec:
-      containers:
-        - name: nsc
-          env:
-            - name: NSM_NETWORK_SERVICES
-              value: kernel://icmp-responder-ip/nsm-1
-
-      nodeSelector:
-        kubernetes.io/hostname: ${NODES[0]}
+  containers:
+  - name: alpine
+    image: alpine:3.15.0
+    imagePullPolicy: IfNotPresent
+    stdin: true
+    tty: true
+  nodeSelector:
+    kubernetes.io/hostname: ${NODES[0]}
 EOF
 ```
+
 Create NSE patch:
 ```bash
 cat > patch-nse.yaml <<EOF
@@ -91,15 +94,15 @@ kubectl apply -k .
 
 Wait for applications ready:
 ```bash
-kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ${NAMESPACE}
+kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ${NAMESPACE}
 ```
 ```bash
 kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ${NAMESPACE}
 ```
 
 Find NSC and NSE pods by labels:
 ```bash
-NSC=$(kubectl get pods -l app=nsc-kernel -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
+NSC=$(kubectl get pods -l app=alpine -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
 ```
 ```bash
 NSE=$(kubectl get pods -l app=nse-memif -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')

diff --git a/examples/features/nse-composition/README.md b/examples/features/nse-composition/README.md
@@ -35,38 +35,41 @@ resources:
 - https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/5012a8aafd293534e2a9d98903f6d339ef44ceab/examples/features/nse-composition/passthrough-2.yaml
 - https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/5012a8aafd293534e2a9d98903f6d339ef44ceab/examples/features/nse-composition/passthrough-3.yaml
 - https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/5012a8aafd293534e2a9d98903f6d339ef44ceab/examples/features/nse-composition/nse-composition-ns.yaml
+- client.yaml
 bases:
-- https://github.com/networkservicemesh/deployments-k8s/apps/nsc-kernel?ref=5012a8aafd293534e2a9d98903f6d339ef44ceab
 - https://github.com/networkservicemesh/deployments-k8s/apps/nse-kernel?ref=5012a8aafd293534e2a9d98903f6d339ef44ceab
 - https://github.com/networkservicemesh/deployments-k8s/examples/features/nse-composition/nse-firewall?ref=5012a8aafd293534e2a9d98903f6d339ef44ceab
 
 patchesStrategicMerge:
-- patch-nsc.yaml
 - patch-nse.yaml
 EOF
 ```
 
-Create NSC patch:
+Create Client:
 ```bash
-cat > patch-nsc.yaml <<EOF
+cat > client.yaml <<EOF
 ---
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: v1
+kind: Pod
 metadata:
-  name: nsc-kernel
+  name: alpine
+  labels:
+    app: alpine    
+  annotations:
+    networkservicemesh.io: kernel://nse-composition/nsm-1
 spec:
-  template:
-    spec:
-      containers:
-        - name: nsc
-          env:
-            - name: NSM_NETWORK_SERVICES
-              value: kernel://nse-composition/nsm-1
-      nodeSelector:
-        kubernetes.io/hostname: ${NODE}
+  containers:
+  - name: alpine
+    image: alpine:3.15.0
+    imagePullPolicy: IfNotPresent
+    stdin: true
+    tty: true
+  nodeSelector:
+    kubernetes.io/hostname: ${NODE}
 EOF
 ```
 
+
 Create NSE patch:
 ```bash
 cat > patch-nse.yaml <<EOF
@@ -104,15 +107,15 @@ kubectl apply -k .
 
 Wait for applications ready:
 ```bash
-kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ${NAMESPACE}
+kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ${NAMESPACE}
 ```
 ```bash
 kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ${NAMESPACE}
 ```
 
 Find nsc and nse pods by labels:
 ```bash
-NSC=$(kubectl get pods -l app=nsc-kernel -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
+NSC=$(kubectl get pods -l app=alpine -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
 ```
 ```bash
 NSE=$(kubectl get pods -l app=nse-kernel -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')

diff --git a/examples/features/webhook/README.md b/examples/features/webhook/README.md
@@ -10,12 +10,6 @@ Make sure that you have completed steps from [features](../)
 
 ## Run
 
-Note: Admission webhook is required and should be started at this moment.
-```bash
-WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
-kubectl wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system
-```
-
 1. Create test namespace:
 ```bash
 NAMESPACE=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/5012a8aafd293534e2a9d98903f6d339ef44ceab/examples/features/namespace.yaml)[0])
@@ -39,7 +33,6 @@ metadata:
     networkservicemesh.io: kernel://my-postgres-service/nsm-1
   labels:
     app: postgres-cl
-    "spiffe.io/spiffe-id": "true"
 spec:
   containers:
   - name: postgres-cl

diff --git a/examples/memory/README.md b/examples/memory/README.md
@@ -14,17 +14,24 @@ Memory example contains setup and tear down logic with default NSM infrastructur
 
 ## Run
 
-Create ns for deployments:
+1. Create ns for deployments:
 ```bash
 kubectl create ns nsm-system
 ```
 
-Apply NSM resources for basic tests:
+2. Apply NSM resources for basic tests:
 
 ```bash
 kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/memory?ref=5012a8aafd293534e2a9d98903f6d339ef44ceab
 ```
 
+3. Wait for admission-webhook-k8s:
+
+```bash
+WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
+kubectl wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system
+```
+
 ## Cleanup
 
 ```bash

diff --git a/examples/memory/kustomization.yaml b/examples/memory/kustomization.yaml
@@ -8,3 +8,4 @@ bases:
 - ../../apps/nsmgr
 - ../../apps/forwarder-vpp
 - ../../apps/registry-memory
+- ../../apps/admission-webhook-k8s