From e2dfaaa8f433332821ef926249fc54531f511328 Mon Sep 17 00:00:00 2001 From: Mikhail Avramenko Date: Tue, 21 Dec 2021 18:58:17 +0700 Subject: [PATCH] added calico patches Signed-off-by: Mikhail Avramenko --- calico/kustomization.yaml | 2 +- examples/basic/README.md | 6 ++++- examples/basic/base/kustomization.yaml | 12 ++++++++++ examples/basic/calico/calico-patch.yaml | 24 +++++++++++++++++++ .../calico}/kustomization.yaml | 6 ++--- examples/basic/kustomization.yaml | 11 --------- examples/multiforwarder/README.md | 6 ++++- .../multiforwarder/base/kustomization.yaml | 12 ++++++++++ .../multiforwarder/calico/calico-patch.yaml | 24 +++++++++++++++++++ .../multiforwarder/calico/kustomization.yaml | 11 +++++++++ examples/multiforwarder/kustomization.yaml | 12 ---------- examples/sriov/README.md | 6 ++++- examples/sriov/base/kustomization.yaml | 13 ++++++++++ .../sriov-patch.yaml} | 0 examples/sriov/calico/calico-patch.yaml | 24 +++++++++++++++++++ examples/sriov/calico/kustomization.yaml | 11 +++++++++ 16 files changed, 149 insertions(+), 31 deletions(-) create mode 100644 examples/basic/base/kustomization.yaml create mode 100644 examples/basic/calico/calico-patch.yaml rename examples/{sriov => basic/calico}/kustomization.yaml (54%) delete mode 100644 examples/basic/kustomization.yaml create mode 100644 examples/multiforwarder/base/kustomization.yaml create mode 100644 examples/multiforwarder/calico/calico-patch.yaml create mode 100644 examples/multiforwarder/calico/kustomization.yaml delete mode 100644 examples/multiforwarder/kustomization.yaml create mode 100644 examples/sriov/base/kustomization.yaml rename examples/sriov/{forwarder-vpp.yaml => base/sriov-patch.yaml} (100%) create mode 100644 examples/sriov/calico/calico-patch.yaml create mode 100644 examples/sriov/calico/kustomization.yaml diff --git a/calico/kustomization.yaml b/calico/kustomization.yaml index bd09e551cc67..446d8683251c 100644 --- a/calico/kustomization.yaml +++ b/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 \ No newline at end of file + - patch.yaml diff --git a/examples/basic/README.md b/examples/basic/README.md index d013225582f1..fcbb5ae9ca63 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=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: diff --git a/examples/basic/base/kustomization.yaml b/examples/basic/base/kustomization.yaml new file mode 100644 index 000000000000..c7c9e3be3596 --- /dev/null +++ b/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 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 343c40e24dff..310c38ff39e9 100644 --- a/examples/multiforwarder/README.md +++ b/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 diff --git a/examples/multiforwarder/base/kustomization.yaml b/examples/multiforwarder/base/kustomization.yaml new file mode 100644 index 000000000000..6abe76a8cd04 --- /dev/null +++ b/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 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 496de75a870d..000000000000 --- a/examples/multiforwarder/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/sriov/README.md b/examples/sriov/README.md index e5ffe88c3cee..a6740eabc942 100644 --- a/examples/sriov/README.md +++ b/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 diff --git a/examples/sriov/base/kustomization.yaml b/examples/sriov/base/kustomization.yaml new file mode 100644 index 000000000000..c8d7158ffe47 --- /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