diff --git a/apps/forwarder-vpp/calico-patch.yaml b/apps/forwarder-vpp/calico-patch.yaml new file mode 100644 index 000000000000..2e2464a94a27 --- /dev/null +++ b/apps/forwarder-vpp/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 diff --git a/examples/basic/README.md b/examples/basic/README.md index 59c1c5da5157..e5d229fc38dd 100644 --- a/examples/basic/README.md +++ b/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=d3257910fdcb2038340b892023d746205369a599 +if [[ -n "${CALICO}" ]]; then # calico + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic/calico?ref=d3257910fdcb2038340b892023d746205369a599 +else + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=d3257910fdcb2038340b892023d746205369a599 +fi ``` ## Cleanup diff --git a/examples/basic/calico/kustomization.yaml b/examples/basic/calico/kustomization.yaml new file mode 100644 index 000000000000..8d627951908e --- /dev/null +++ b/examples/basic/calico/kustomization.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: nsm-system + +resources: +- ../ + +patchesStrategicMerge: +- ../../../apps/forwarder-vpp/calico-patch.yaml diff --git a/examples/multiforwarder/README.md b/examples/multiforwarder/README.md index e5a7a6c9dac3..89b79a95eb13 100644 --- a/examples/multiforwarder/README.md +++ b/examples/multiforwarder/README.md @@ -21,7 +21,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=d3257910fdcb2038340b892023d746205369a599 +if [[ -n ${CALICO} ]]; then # calico + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/multiforwarder/calico?ref=d3257910fdcb2038340b892023d746205369a599 +else + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/multiforwarder?ref=d3257910fdcb2038340b892023d746205369a599 +fi ``` ## Cleanup diff --git a/examples/multiforwarder/calico/kustomization.yaml b/examples/multiforwarder/calico/kustomization.yaml new file mode 100644 index 000000000000..8d627951908e --- /dev/null +++ b/examples/multiforwarder/calico/kustomization.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: nsm-system + +resources: +- ../ + +patchesStrategicMerge: +- ../../../apps/forwarder-vpp/calico-patch.yaml diff --git a/examples/sriov/README.md b/examples/sriov/README.md index 1004dfa43a14..ce5ba663a7b5 100644 --- a/examples/sriov/README.md +++ b/examples/sriov/README.md @@ -16,7 +16,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=d3257910fdcb2038340b892023d746205369a599 +if [[ -n ${CALICO} ]]; then # calico + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/sriov/calico?ref=d3257910fdcb2038340b892023d746205369a599 +else + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/sriov?ref=d3257910fdcb2038340b892023d746205369a599 +fi ``` ## Cleanup diff --git a/examples/sriov/calico/kustomization.yaml b/examples/sriov/calico/kustomization.yaml new file mode 100644 index 000000000000..8d627951908e --- /dev/null +++ b/examples/sriov/calico/kustomization.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: nsm-system + +resources: +- ../ + +patchesStrategicMerge: +- ../../../apps/forwarder-vpp/calico-patch.yaml