From 42109f6f9ebadf9f1032a73af4f30af6deadc3ce Mon Sep 17 00:00:00 2001 From: Mikhail Avramenko Date: Thu, 23 Dec 2021 14:29:56 +0700 Subject: [PATCH] review fixes Signed-off-by: Mikhail Avramenko --- examples/basic/README.md | 6 +- examples/basic/base/kustomization.yaml | 11 ---- examples/basic/calico/kustomization.yaml | 11 ---- examples/basic/kustomization.yaml | 11 ++++ examples/calico/README.md | 58 +++++++++++++++++++ examples/{basic => }/calico/calico-patch.yaml | 0 .../calico-vpp-patch.yaml | 0 .../calico-vpp-dataplane}/kustomization.yaml | 2 +- .../{sriov => }/calico/kustomization.yaml | 4 +- examples/multiforwarder/README.md | 6 +- .../multiforwarder/base/kustomization.yaml | 12 ---- .../multiforwarder/calico/calico-patch.yaml | 24 -------- examples/multiforwarder/kustomization.yaml | 12 ++++ examples/sriov/README.md | 6 +- examples/sriov/base/kustomization.yaml | 13 ----- examples/sriov/calico/calico-patch.yaml | 24 -------- .../sriov-patch.yaml => forwarder-vpp.yaml} | 0 .../calico => sriov}/kustomization.yaml | 6 +- 18 files changed, 90 insertions(+), 116 deletions(-) delete mode 100644 examples/basic/base/kustomization.yaml delete mode 100644 examples/basic/calico/kustomization.yaml create mode 100644 examples/basic/kustomization.yaml create mode 100644 examples/calico/README.md rename examples/{basic => }/calico/calico-patch.yaml (100%) rename calico/patch.yaml => examples/calico/calico-vpp-dataplane/calico-vpp-patch.yaml (100%) rename {calico => examples/calico/calico-vpp-dataplane}/kustomization.yaml (89%) rename examples/{sriov => }/calico/kustomization.yaml (77%) delete mode 100644 examples/multiforwarder/base/kustomization.yaml delete mode 100644 examples/multiforwarder/calico/calico-patch.yaml create mode 100644 examples/multiforwarder/kustomization.yaml delete mode 100644 examples/sriov/base/kustomization.yaml delete mode 100644 examples/sriov/calico/calico-patch.yaml rename examples/sriov/{base/sriov-patch.yaml => forwarder-vpp.yaml} (100%) rename examples/{multiforwarder/calico => sriov}/kustomization.yaml (54%) diff --git a/examples/basic/README.md b/examples/basic/README.md index fcbb5ae9ca63..d013225582f1 100644 --- a/examples/basic/README.md +++ b/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: diff --git a/examples/basic/base/kustomization.yaml b/examples/basic/base/kustomization.yaml deleted file mode 100644 index 7a0b5d708cc6..000000000000 --- a/examples/basic/base/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/basic/calico/kustomization.yaml b/examples/basic/calico/kustomization.yaml deleted file mode 100644 index c3561234ee2f..000000000000 --- a/examples/basic/calico/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: nsm-system - -bases: - - ../base - -patchesStrategicMerge: - - calico-patch.yaml diff --git a/examples/basic/kustomization.yaml b/examples/basic/kustomization.yaml new file mode 100644 index 000000000000..38a144ce36ef --- /dev/null +++ b/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 diff --git a/examples/calico/README.md b/examples/calico/README.md new file mode 100644 index 000000000000..8cc9fe10b561 --- /dev/null +++ b/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 +``` diff --git a/examples/basic/calico/calico-patch.yaml b/examples/calico/calico-patch.yaml similarity index 100% rename from examples/basic/calico/calico-patch.yaml rename to examples/calico/calico-patch.yaml diff --git a/calico/patch.yaml b/examples/calico/calico-vpp-dataplane/calico-vpp-patch.yaml similarity index 100% rename from calico/patch.yaml rename to examples/calico/calico-vpp-dataplane/calico-vpp-patch.yaml diff --git a/calico/kustomization.yaml b/examples/calico/calico-vpp-dataplane/kustomization.yaml similarity index 89% rename from calico/kustomization.yaml rename to examples/calico/calico-vpp-dataplane/kustomization.yaml index 446d8683251c..293e6fcd9165 100644 --- a/calico/kustomization.yaml +++ b/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 diff --git a/examples/sriov/calico/kustomization.yaml b/examples/calico/kustomization.yaml similarity index 77% rename from examples/sriov/calico/kustomization.yaml rename to examples/calico/kustomization.yaml index c3561234ee2f..c0111d4ce57e 100644 --- a/examples/sriov/calico/kustomization.yaml +++ b/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 diff --git a/examples/multiforwarder/README.md b/examples/multiforwarder/README.md index 310c38ff39e9..343c40e24dff 100644 --- a/examples/multiforwarder/README.md +++ b/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 diff --git a/examples/multiforwarder/base/kustomization.yaml b/examples/multiforwarder/base/kustomization.yaml deleted file mode 100644 index 6abe76a8cd04..000000000000 --- a/examples/multiforwarder/base/kustomization.yaml +++ /dev/null @@ -1,12 +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 -- ../../../apps/admission-webhook-k8s diff --git a/examples/multiforwarder/calico/calico-patch.yaml b/examples/multiforwarder/calico/calico-patch.yaml deleted file mode 100644 index 2e2464a94a27..000000000000 --- a/examples/multiforwarder/calico/calico-patch.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -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/kustomization.yaml b/examples/multiforwarder/kustomization.yaml new file mode 100644 index 000000000000..496de75a870d --- /dev/null +++ b/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 diff --git a/examples/sriov/README.md b/examples/sriov/README.md index a6740eabc942..e5ffe88c3cee 100644 --- a/examples/sriov/README.md +++ b/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 diff --git a/examples/sriov/base/kustomization.yaml b/examples/sriov/base/kustomization.yaml deleted file mode 100644 index c8d7158ffe47..000000000000 --- a/examples/sriov/base/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -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/calico/calico-patch.yaml b/examples/sriov/calico/calico-patch.yaml deleted file mode 100644 index 2e2464a94a27..000000000000 --- a/examples/sriov/calico/calico-patch.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -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/base/sriov-patch.yaml b/examples/sriov/forwarder-vpp.yaml similarity index 100% rename from examples/sriov/base/sriov-patch.yaml rename to examples/sriov/forwarder-vpp.yaml diff --git a/examples/multiforwarder/calico/kustomization.yaml b/examples/sriov/kustomization.yaml similarity index 54% rename from examples/multiforwarder/calico/kustomization.yaml rename to examples/sriov/kustomization.yaml index c3561234ee2f..b35330923555 100644 --- a/examples/multiforwarder/calico/kustomization.yaml +++ b/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