added calico patches

Signed-off-by: Mikhail Avramenko <[email protected]>

calico/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
+  - patch.yaml

examples/basic/README.md

@@ -31,7 +31,11 @@ kubectl create ns nsm-system
 2. Apply NSM resources for basic tests:
 
 ```bash
-kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
+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
 ```
 
 3. Wait for admission-webhook-k8s:

examples/basic/base/kustomization.yaml

@@ -0,0 +1,12 @@
+
+---
+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/basic/calico/calico-patch.yaml

@@ -0,0 +1,24 @@
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: forwarder-vpp
+spec:
+  template:
+    spec:
+      hostPID: true
+      containers:
+        - name: forwarder-vpp
+          env:
+            - name: NSM_VPP_API_SOCKET
+              value: /var/run/vpp/vpp-api.sock
+            - name: NSM_VPP_INIT
+              value: NONE
+          volumeMounts:
+            - name: vpp
+              mountPath: /var/run/vpp
+      volumes:
+        - name: vpp
+          hostPath:
+            path: /var/run/vpp
+            type: Directory

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

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

examples/multiforwarder/README.md

@@ -41,7 +41,11 @@ kubectl create ns nsm-system
 
 Apply NSM resources for basic tests:
 ```bash
-kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/multiforwarder?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
+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
 ```
 
 ## Cleanup

examples/multiforwarder/base/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/multiforwarder/calico/calico-patch.yaml

@@ -0,0 +1,24 @@
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: forwarder-vpp
+spec:
+  template:
+    spec:
+      hostPID: true
+      containers:
+        - name: forwarder-vpp
+          env:
+            - name: NSM_VPP_API_SOCKET
+              value: /var/run/vpp/vpp-api.sock
+            - name: NSM_VPP_INIT
+              value: NONE
+          volumeMounts:
+            - name: vpp
+              mountPath: /var/run/vpp
+      volumes:
+        - name: vpp
+          hostPath:
+            path: /var/run/vpp
+            type: Directory

examples/multiforwarder/calico/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: nsm-system
+
+bases:
+  - ../base
+
+patchesStrategicMerge:
+  - calico-patch.yaml

examples/sriov/README.md

@@ -36,7 +36,11 @@ kubectl create ns nsm-system
 
 Apply NSM resources for basic tests:
 ```bash
-kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/sriov?ref=bbe46ecf104280e96ae3a32d4757149e792f0d11
+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
 ```
 
 ## Cleanup

examples/sriov/base/kustomization.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: nsm-system
+
+bases:
+  - ../../../apps/nsmgr
+  - ../../../apps/forwarder-vpp
+  - ../../../apps/registry-k8s
+
+patchesStrategicMerge:
+- sriov-patch.yaml

examples/sriov/calico/calico-patch.yaml

@@ -0,0 +1,24 @@
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: forwarder-vpp
+spec:
+  template:
+    spec:
+      hostPID: true
+      containers:
+        - name: forwarder-vpp
+          env:
+            - name: NSM_VPP_API_SOCKET
+              value: /var/run/vpp/vpp-api.sock
+            - name: NSM_VPP_INIT
+              value: NONE
+          volumeMounts:
+            - name: vpp
+              mountPath: /var/run/vpp
+      volumes:
+        - name: vpp
+          hostPath:
+            path: /var/run/vpp
+            type: Directory

examples/sriov/calico/kustomization.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: nsm-system
+
+bases:
+  - ../base
+
+patchesStrategicMerge:
+  - calico-patch.yaml