diff --git a/examples/basic/README.md b/examples/basic/README.md index fef57db122e4..70f045b68ec7 100644 --- a/examples/basic/README.md +++ b/examples/basic/README.md @@ -29,9 +29,12 @@ 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=6b88da39e40e64d665add469616315a9c289ecdb +if [[ "${CALICO}" == "on" ]]; then # calico + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic/calico?ref=6b88da39e40e64d665add469616315a9c289ecdb +else + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic/base?ref=6b88da39e40e64d665add469616315a9c289ecdb +fi ``` ## Cleanup diff --git a/examples/basic/base/kustomization.yaml b/examples/basic/base/kustomization.yaml new file mode 100644 index 000000000000..7a0b5d708cc6 --- /dev/null +++ b/examples/basic/base/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 diff --git a/examples/basic/calico/calico-patch.yaml b/examples/basic/calico/calico-patch.yaml new file mode 100644 index 000000000000..2e2464a94a27 --- /dev/null +++ b/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 diff --git a/examples/sriov/kustomization.yaml b/examples/basic/calico/kustomization.yaml similarity index 54% rename from examples/sriov/kustomization.yaml rename to examples/basic/calico/kustomization.yaml index b35330923555..c3561234ee2f 100644 --- a/examples/sriov/kustomization.yaml +++ b/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 diff --git a/examples/basic/kustomization.yaml b/examples/basic/kustomization.yaml deleted file mode 100644 index 38a144ce36ef..000000000000 --- a/examples/basic/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: nsm-system - -bases: -- ../../apps/nsmgr -- ../../apps/forwarder-vpp -- ../../apps/registry-k8s -- ../../apps/admission-webhook-k8s diff --git a/examples/multiforwarder/README.md b/examples/multiforwarder/README.md index fe7b9676fa4a..7c58f3b44467 100644 --- a/examples/multiforwarder/README.md +++ b/examples/multiforwarder/README.md @@ -19,9 +19,13 @@ kubectl create ns nsm-system ``` -Apply NSM resources for basic tests: +2. Apply NSM resources for multiforwarder tests: ```bash -kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/multiforwarder?ref=6b88da39e40e64d665add469616315a9c289ecdb +if [[ "${CALICO}" == "on" ]]; then # calico + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/multiforwarder/calico?ref=6b88da39e40e64d665add469616315a9c289ecdb +else + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/multiforwarder/base?ref=6b88da39e40e64d665add469616315a9c289ecdb +fi ``` ## Cleanup diff --git a/examples/multiforwarder/base/kustomization.yaml b/examples/multiforwarder/base/kustomization.yaml new file mode 100644 index 000000000000..645746b4bf03 --- /dev/null +++ b/examples/multiforwarder/base/kustomization.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: nsm-system + +bases: + - ../../../apps/nsmgr + - ../../../apps/forwarder-vpp + - ../../../apps/forwarder-sriov + - ../../../apps/registry-k8s diff --git a/examples/multiforwarder/calico/calico-patch.yaml b/examples/multiforwarder/calico/calico-patch.yaml new file mode 100644 index 000000000000..2e2464a94a27 --- /dev/null +++ b/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 diff --git a/examples/multiforwarder/calico/kustomization.yaml b/examples/multiforwarder/calico/kustomization.yaml new file mode 100644 index 000000000000..c3561234ee2f --- /dev/null +++ b/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 diff --git a/examples/multiforwarder/kustomization.yaml b/examples/multiforwarder/kustomization.yaml deleted file mode 100644 index 8521095af108..000000000000 --- a/examples/multiforwarder/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: nsm-system - -bases: -- ../../apps/nsmgr -- ../../apps/forwarder-vpp -- ../../apps/forwarder-sriov -- ../../apps/registry-k8s diff --git a/examples/sriov/README.md b/examples/sriov/README.md index 4fc80f5fb6c8..a80390cde7d5 100644 --- a/examples/sriov/README.md +++ b/examples/sriov/README.md @@ -14,9 +14,13 @@ kubectl create ns nsm-system ``` -Apply NSM resources for basic tests: +2. Apply NSM resources for SR-IOV tests: ```bash -kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/sriov?ref=6b88da39e40e64d665add469616315a9c289ecdb +if [[ "${CALICO}" == on ]]; then # calico + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/sriov/calico?ref=6b88da39e40e64d665add469616315a9c289ecdb +else + kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/sriov/base?ref=6b88da39e40e64d665add469616315a9c289ecdb +fi ``` ## Cleanup diff --git a/examples/sriov/base/kustomization.yaml b/examples/sriov/base/kustomization.yaml new file mode 100644 index 000000000000..316b9a5c590e --- /dev/null +++ b/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 diff --git a/examples/sriov/forwarder-vpp.yaml b/examples/sriov/base/sriov-patch.yaml similarity index 100% rename from examples/sriov/forwarder-vpp.yaml rename to examples/sriov/base/sriov-patch.yaml diff --git a/examples/sriov/calico/calico-patch.yaml b/examples/sriov/calico/calico-patch.yaml new file mode 100644 index 000000000000..2e2464a94a27 --- /dev/null +++ b/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 diff --git a/examples/sriov/calico/kustomization.yaml b/examples/sriov/calico/kustomization.yaml new file mode 100644 index 000000000000..c3561234ee2f --- /dev/null +++ b/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