review fixes

Signed-off-by: Mikhail Avramenko <avramenkomihail15@gmail.com>

examples/basic/README.md

@@ -31,11 +31,7 @@ kubectl create ns nsm-system
 2. Apply NSM resources for basic tests:
 
 ```bash
-if [[ "${CALICO}" == "on" ]]; then
-  kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic/calico?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
-else
-  kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic/base?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
-fi
+kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
 ```
 
 3. Wait for admission-webhook-k8s:

examples/basic/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: nsm-system
+
+bases:
+- ../../apps/nsmgr
+- ../../apps/forwarder-vpp
+- ../../apps/registry-k8s
+- ../../apps/admission-webhook-k8s

examples/calico/README.md

@@ -0,0 +1,58 @@
+# Calico examples
+
+Contain calico setup for NSM.
+
+## Requires
+
+- [spire](../spire)
+
+## Includes
+
+- [Memif to Memif Connection](../use-cases/Memif2Memif)
+- [Kernel to Kernel Connection](../use-cases/Kernel2Kernel)
+- [Kernel to Memif Connection](../use-cases/Kernel2Memif)
+- [Memif to Kernel Connection](../use-cases/Memif2Kernel)
+- [Kernel to VXLAN to Kernel Connection](../use-cases/Kernel2Vxlan2Kernel)
+- [Memif to VXLAN to Memif Connection](../use-cases/Memif2Vxlan2Memif)
+- [Kernel to VXLAN to Memif Connection](../use-cases/Kernel2Vxlan2Memif)
+- [Memif to VXLAN to Kernel Connection](../use-cases/Memif2Vxlan2Kernel)
+- [Kernel to Wireguard to Kernel Connection](../use-cases/Kernel2Wireguard2Kernel)
+- [Memif to Wireguard to Memif Connection](../use-cases/Memif2Wireguard2Memif)
+- [Kernel to Wireguard to Memif Connection](../use-cases/Kernel2Wireguard2Memif)
+- [Memif to Wireguard to Kernel Connection](../use-cases/Memif2Wireguard2Kernel)
+- [Kernel to Kernel IPv6](../features/ipv6/Kernel2Kernel)
+- [Kernel to Wireguard to Kernel IPv6](../features/ipv6/Kernel2Wireguard2Kernel)
+- [Kernel to Wireguard to Memif IPv6](../features/ipv6/Kernel2Wireguard2Memif)
+- [Memif to Memif IPv6](../features/ipv6/Memif2Memif)
+- [Memif to Wireguard to Kernel IPv6](../features/ipv6/Memif2Wireguard2Kernel)
+- [Memif to Wireguard to Memif IPv6](../features/ipv6/Memif2Wireguard2Memif)
+- [Nse composition](../features/nse-composition)
+
+## Run
+
+1. Create ns for deployments:
+```bash
+kubectl create ns nsm-system
+```
+
+2. Apply NSM resources for calico tests:
+
+```bash
+kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/calico/?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
+```
+
+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:
+
+```bash
+kubectl delete mutatingwebhookconfiguration --all
+kubectl delete ns nsm-system
+```

calico/kustomization.yaml → examples/calico/calico-vpp-dataplane/kustomization.yaml

@@ -6,4 +6,4 @@ resources:
   - https://raw.githubusercontent.com/projectcalico/vpp-dataplane/v0.17.0-calicov3.20.2/yaml/generated/calico-vpp-nohuge.yaml
 
 patchesStrategicMerge:
-  - patch.yaml
+  - calico-vpp-patch.yaml

examples/sriov/calico/kustomization.yaml → examples/calico/kustomization.yaml

@@ -2,10 +2,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: nsm-system
-
 bases:
-  - ../base
+  - ../basic
 
 patchesStrategicMerge:
   - calico-patch.yaml

examples/multiforwarder/README.md

@@ -41,11 +41,7 @@ kubectl create ns nsm-system
 
 Apply NSM resources for basic tests:
 ```bash
-if [[ "${CALICO}" == "on" ]]; then # calico
-  kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/multiforwarder/calico?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
-else
-  kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/multiforwarder/base?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
-fi
+kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/multiforwarder?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
 ```
 
 ## Cleanup

examples/multiforwarder/kustomization.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: nsm-system
+
+bases:
+- ../../apps/nsmgr
+- ../../apps/forwarder-vpp
+- ../../apps/forwarder-sriov
+- ../../apps/registry-k8s
+- ../../apps/admission-webhook-k8s

examples/sriov/README.md

@@ -36,11 +36,7 @@ kubectl create ns nsm-system
 
 Apply NSM resources for basic tests:
 ```bash
-if [[ "${CALICO}" == on ]]; then # calico
-  kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/sriov/calico?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
-else
-  kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/sriov/base?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
-fi
+kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/sriov?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
 ```
 
 ## Cleanup

examples/multiforwarder/calico/kustomization.yaml → examples/sriov/kustomization.yaml

@@ -5,7 +5,9 @@ kind: Kustomization
 namespace: nsm-system
 
 bases:
-  - ../base
+  - ../../apps/nsmgr
+  - ../../apps/forwarder-vpp
+  - ../../apps/registry-k8s
 
 patchesStrategicMerge:
-  - calico-patch.yaml
+  - forwarder-vpp.yaml