From 6bfdf6a0e2444319e4bf3de270b1be8bf0b33533 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 10 Nov 2022 12:48:12 +0000 Subject: [PATCH] Update go.mod and go.sum to latest version from networkservicemesh/deployments-k8s@main PR link: https://github.com/networkservicemesh/deployments-k8s/pull/7723 Commit: e9e494d Author: Denis Tingaikin Date: 2022-11-10 13:41:02 +0300 Message: - Merge pull request #2308 from NikitaSkrynnik/fix-update-gomod Signed-off-by: NSMBot --- extensions/base/suite.go | 2 +- suites/basic/suite.gen.go | 26 +++---- suites/features/suite.gen.go | 44 ++++++------ .../floating_interdomain/spire/suite.gen.go | 6 +- suites/floating_interdomain/suite.gen.go | 54 +++++++-------- suites/heal/suite.gen.go | 68 +++++++++---------- suites/interdomain/nsm/suite.gen.go | 4 +- .../nsm_istio_booking/suite.gen.go | 8 +-- suites/interdomain/spire/suite.gen.go | 2 +- suites/interdomain/suite.gen.go | 38 +++++------ .../external_nsc/docker/suite.gen.go | 2 +- .../external_nsc/spire/suite.gen.go | 2 +- suites/k8s_monolith/external_nsc/suite.gen.go | 4 +- .../external_nse/docker/suite.gen.go | 2 +- .../external_nse/spire/suite.gen.go | 2 +- suites/k8s_monolith/external_nse/suite.gen.go | 4 +- suites/memory/suite.gen.go | 8 +-- suites/multiforwarder/suite.gen.go | 16 ++--- suites/observability/suite.gen.go | 6 +- suites/ovs/suite.gen.go | 10 +-- suites/remotevlan/rvlanovs/suite.gen.go | 6 +- suites/remotevlan/rvlanvpp/suite.gen.go | 6 +- suites/spire/suite.gen.go | 2 +- suites/sriov/suite.gen.go | 6 +- 24 files changed, 164 insertions(+), 164 deletions(-) diff --git a/extensions/base/suite.go b/extensions/base/suite.go index 6db4add7df..e5ec520c89 100644 --- a/extensions/base/suite.go +++ b/extensions/base/suite.go @@ -52,7 +52,7 @@ func (s *Suite) TearDownSuite() { } const ( - sha = "d97fe54a82dca695884e081e7d412c5383d15faf" + sha = "144ee6efba2b5d423e08142478f6cd71c86200fc" ) // SetupSuite runs all extensions diff --git a/suites/basic/suite.gen.go b/suites/basic/suite.gen.go index bb7c720c02..0e7fdfbe1b 100755 --- a/suites/basic/suite.gen.go +++ b/suites/basic/suite.gen.go @@ -28,7 +28,7 @@ func (s *Suite) SetupSuite() { r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl delete mutatingwebhookconfiguration ${WH}` + "\n" + `kubectl delete ns nsm-system`) }) r.Run(`kubectl create ns nsm-system`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/basic?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`WH=$(kubectl get pods -l app=admission-webhook-k8s -n nsm-system --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')` + "\n" + `kubectl wait --for=condition=ready --timeout=1m pod ${WH} -n nsm-system`) } func (s *Suite) TestKernel2Kernel() { @@ -37,7 +37,7 @@ func (s *Suite) TestKernel2Kernel() { r.Run(`kubectl delete ns ns-kernel2kernel`) }) r.Run(`kubectl create ns ns-kernel2kernel`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Kernel?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Kernel?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2kernel`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2kernel`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -51,7 +51,7 @@ func (s *Suite) TestKernel2Memif() { r.Run(`kubectl delete ns ns-kernel2memif`) }) r.Run(`kubectl create ns ns-kernel2memif`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Memif?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Memif?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2memif`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-kernel2memif`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -65,7 +65,7 @@ func (s *Suite) TestKernel2Vxlan2Kernel() { r.Run(`kubectl delete ns ns-kernel2vxlan2kernel`) }) r.Run(`kubectl create ns ns-kernel2vxlan2kernel`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Kernel?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Kernel?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2vxlan2kernel`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2vxlan2kernel`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2vxlan2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -79,7 +79,7 @@ func (s *Suite) TestKernel2Vxlan2Memif() { r.Run(`kubectl delete ns ns-kernel2vxlan2memif`) }) r.Run(`kubectl create ns ns-kernel2vxlan2memif`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Memif?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Vxlan2Memif?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2vxlan2memif`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-kernel2vxlan2memif`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2vxlan2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -93,7 +93,7 @@ func (s *Suite) TestKernel2Wireguard2Kernel() { r.Run(`kubectl delete ns ns-kernel2wireguard2kernel`) }) r.Run(`kubectl create ns ns-kernel2wireguard2kernel`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Wireguard2Kernel?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Wireguard2Kernel?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2wireguard2kernel`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2wireguard2kernel`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2wireguard2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -107,7 +107,7 @@ func (s *Suite) TestKernel2Wireguard2Memif() { r.Run(`kubectl delete ns ns-kernel2wireguard2memif`) }) r.Run(`kubectl create ns ns-kernel2wireguard2memif`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Wireguard2Memif?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Kernel2Wireguard2Memif?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2wireguard2memif`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-kernel2wireguard2memif`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2wireguard2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -121,7 +121,7 @@ func (s *Suite) TestMemif2Kernel() { r.Run(`kubectl delete ns ns-memif2kernel`) }) r.Run(`kubectl create ns ns-memif2kernel`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Kernel?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Kernel?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2kernel`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-memif2kernel`) r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -135,7 +135,7 @@ func (s *Suite) TestMemif2Memif() { r.Run(`kubectl delete ns ns-memif2memif`) }) r.Run(`kubectl create ns ns-memif2memif`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Memif?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Memif?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2memif`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-memif2memif`) r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -149,7 +149,7 @@ func (s *Suite) TestMemif2Vxlan2Kernel() { r.Run(`kubectl delete ns ns-memif2vxlan2kernel`) }) r.Run(`kubectl create ns ns-memif2vxlan2kernel`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Vxlan2Kernel?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Vxlan2Kernel?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2vxlan2kernel`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-memif2vxlan2kernel`) r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2vxlan2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -163,7 +163,7 @@ func (s *Suite) TestMemif2Vxlan2Memif() { r.Run(`kubectl delete ns ns-memif2vxlan2memif`) }) r.Run(`kubectl create ns ns-memif2vxlan2memif`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Vxlan2Memif?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Vxlan2Memif?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2vxlan2memif`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-memif2vxlan2memif`) r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2vxlan2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -177,7 +177,7 @@ func (s *Suite) TestMemif2Wireguard2Kernel() { r.Run(`kubectl delete ns ns-memif2wireguard2kernel`) }) r.Run(`kubectl create ns ns-memif2wireguard2kernel`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Wireguard2Kernel?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Wireguard2Kernel?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2wireguard2kernel`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-memif2wireguard2kernel`) r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2wireguard2kernel --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -191,7 +191,7 @@ func (s *Suite) TestMemif2Wireguard2Memif() { r.Run(`kubectl delete ns ns-memif2wireguard2memif`) }) r.Run(`kubectl create ns ns-memif2wireguard2memif`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Wireguard2Memif?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/Memif2Wireguard2Memif?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2wireguard2memif`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-memif2wireguard2memif`) r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2wireguard2memif --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) diff --git a/suites/features/suite.gen.go b/suites/features/suite.gen.go index 93b215b939..26e66631f6 100755 --- a/suites/features/suite.gen.go +++ b/suites/features/suite.gen.go @@ -29,10 +29,10 @@ func (s *Suite) TestAnnotated_namespace() { s.T().Cleanup(func() { r.Run(`kubectl delete ns ns-annotated-namespace`) }) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/annotated-namespace?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/annotated-namespace?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-annotated-namespace`) r.Run(`kubectl annotate ns ns-annotated-namespace networkservicemesh.io=kernel://annotated-namespace/nsm-1`) - r.Run(`kubectl apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/0d9869f4040068f554db54306eb463bb2358e3c7/examples/features/annotated-namespace/client.yaml`) + r.Run(`kubectl apply -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/1c91525906fde1ba14b0c8ef06013602349f7f66/examples/features/annotated-namespace/client.yaml`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-annotated-namespace`) r.Run(`NSE=$(kubectl get pods -l app=nse-kernel -n ns-annotated-namespace --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-annotated-namespace --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -45,7 +45,7 @@ func (s *Suite) TestDns() { r.Run(`kubectl delete ns ns-dns`) }) r.Run(`kubectl create ns ns-dns`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dns?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dns?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=5m pod dnsutils -n ns-dns`) r.Run(`kubectl wait --for=condition=ready --timeout=5m pod -l app=nse-kernel -n ns-dns`) r.Run(`NSC=$(kubectl get pods -l app=dnsutils -n ns-dns --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -60,7 +60,7 @@ func (s *Suite) TestKernel2Kernel_dual_stack() { r.Run(`kubectl delete ns ns-kernel2kernel-dual-stack`) }) r.Run(`kubectl create ns ns-kernel2kernel-dual-stack`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dual-stack/Kernel2Kernel_dual_stack?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dual-stack/Kernel2Kernel_dual_stack?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2kernel-dual-stack`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2kernel-dual-stack`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2kernel-dual-stack --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -76,7 +76,7 @@ func (s *Suite) TestKernel2Wireguard2Kernel_dual_stack() { r.Run(`kubectl delete ns ns-kernel2wireguard2kernel-dual-stack`) }) r.Run(`kubectl create ns ns-kernel2wireguard2kernel-dual-stack`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dual-stack/Kernel2Wireguard2Kernel_dual_stack?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/dual-stack/Kernel2Wireguard2Kernel_dual_stack?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2wireguard2kernel-dual-stack`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2wireguard2kernel-dual-stack`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2wireguard2kernel-dual-stack --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -93,7 +93,7 @@ func (s *Suite) TestExclude_prefixes() { }) r.Run(`kubectl create ns ns-exclude-prefixes`) r.Run(`kubectl apply -f exclude-prefixes-config-map.yaml`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/exclude-prefixes?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/exclude-prefixes?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-exclude-prefixes`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-exclude-prefixes`) r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-exclude-prefixes --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -107,7 +107,7 @@ func (s *Suite) TestExclude_prefixes_client() { r.Run(`kubectl delete ns ns-exclude-prefixes-client`) }) r.Run(`kubectl create ns ns-exclude-prefixes-client`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/exclude-prefixes-client?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/exclude-prefixes-client?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-exclude-prefixes-client`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel-1 -n ns-exclude-prefixes-client`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel-2 -n ns-exclude-prefixes-client`) @@ -125,7 +125,7 @@ func (s *Suite) TestKernel2Kernel_ipv6() { r.Run(`kubectl delete ns ns-kernel2kernel-ipv6`) }) r.Run(`kubectl create ns ns-kernel2kernel-ipv6`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Kernel_ipv6?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Kernel_ipv6?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2kernel-ipv6`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2kernel-ipv6`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2kernel-ipv6 --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -139,7 +139,7 @@ func (s *Suite) TestKernel2Wireguard2Kernel_ipv6() { r.Run(`kubectl delete ns ns-kernel2wireguard2kernel-ipv6`) }) r.Run(`kubectl create ns ns-kernel2wireguard2kernel-ipv6`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Wireguard2Kernel_ipv6?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Wireguard2Kernel_ipv6?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2wireguard2kernel-ipv6`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-kernel2wireguard2kernel-ipv6`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2wireguard2kernel-ipv6 --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -153,7 +153,7 @@ func (s *Suite) TestKernel2Wireguard2Memif_ipv6() { r.Run(`kubectl delete ns ns-kernel2wireguard2memif-ipv6`) }) r.Run(`kubectl create ns ns-kernel2wireguard2memif-ipv6`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Wireguard2Memif_ipv6?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Kernel2Wireguard2Memif_ipv6?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-kernel2wireguard2memif-ipv6`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-kernel2wireguard2memif-ipv6`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-kernel2wireguard2memif-ipv6 --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -181,7 +181,7 @@ func (s *Suite) TestMemif2Wireguard2Kernel_ipv6() { r.Run(`kubectl delete ns ns-memif2wireguard2kernel-ipv6`) }) r.Run(`kubectl create ns ns-memif2wireguard2kernel-ipv6`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Memif2Wireguard2Kernel_ipv6?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Memif2Wireguard2Kernel_ipv6?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2wireguard2kernel-ipv6`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-memif2wireguard2kernel-ipv6`) r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2wireguard2kernel-ipv6 --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -195,7 +195,7 @@ func (s *Suite) TestMemif2Wireguard2Memif_ipv6() { r.Run(`kubectl delete ns ns-memif2wireguard2memif-ipv6`) }) r.Run(`kubectl create ns ns-memif2wireguard2memif-ipv6`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Memif2Wireguard2Memif_ipv6?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/ipv6/Memif2Wireguard2Memif_ipv6?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-memif -n ns-memif2wireguard2memif-ipv6`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-memif -n ns-memif2wireguard2memif-ipv6`) r.Run(`NSC=$(kubectl get pods -l app=nsc-memif -n ns-memif2wireguard2memif-ipv6 --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -209,7 +209,7 @@ func (s *Suite) TestMutually_aware_nses() { r.Run(`kubectl delete ns ns-mutually-aware-nses`) }) r.Run(`kubectl create ns ns-mutually-aware-nses`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/mutually-aware-nses?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/mutually-aware-nses?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-mutually-aware-nses`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel-1 -n ns-mutually-aware-nses`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel-2 -n ns-mutually-aware-nses`) @@ -224,7 +224,7 @@ func (s *Suite) TestNse_composition() { r.Run(`kubectl delete ns ns-nse-composition`) }) r.Run(`kubectl create ns ns-nse-composition`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/nse-composition?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/nse-composition?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-nse-composition`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-nse-composition`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-nse-composition --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -240,7 +240,7 @@ func (s *Suite) TestOpa() { r.Run(`kubectl delete ns ns-opa`) }) r.Run(`kubectl create ns ns-opa`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/opa?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/opa?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nsc-kernel -n ns-opa`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-opa`) r.Run(`NSC=$(kubectl get pods -l app=nsc-kernel -n ns-opa --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -253,7 +253,7 @@ func (s *Suite) TestPolicy_based_routing() { r.Run(`kubectl delete ns ns-policy-based-routing`) }) r.Run(`kubectl create ns ns-policy-based-routing`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/policy-based-routing?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/policy-based-routing?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nettools -n ns-policy-based-routing`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-policy-based-routing`) r.Run(`NSC=$(kubectl get pods -l app=nettools -n ns-policy-based-routing --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -274,7 +274,7 @@ func (s *Suite) TestScale_from_zero() { }) r.Run(`kubectl create ns ns-scale-from-zero`) r.Run(`NODES=($(kubectl get nodes -o go-template='{{range .items}}{{ if not .spec.taints }}{{ .metadata.name }} {{end}}{{end}}'))` + "\n" + `NSC_NODE=${NODES[0]}` + "\n" + `SUPPLIER_NODE=${NODES[1]}` + "\n" + `if [ "$SUPPLIER_NODE" == "" ]; then SUPPLIER_NODE=$NSC_NODE; echo "Only 1 node found, testing that pod is created on the same node is useless"; fi`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/scale-from-zero?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/scale-from-zero?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait -n ns-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nse-supplier-k8s`) r.Run(`kubectl wait -n ns-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nsc-kernel`) r.Run(`kubectl wait -n ns-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nse-icmp-responder`) @@ -292,7 +292,7 @@ func (s *Suite) TestSelect_forwarder() { r.Run(`kubectl delete ns ns-select-forwarder`) }) r.Run(`kubectl create ns ns-select-forwarder`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/select-forwarder?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/select-forwarder?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=alpine -n ns-select-forwarder`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nse-kernel -n ns-select-forwarder`) r.Run(`NSC=$(kubectl get pods -l app=alpine -n ns-select-forwarder --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) @@ -307,7 +307,7 @@ func (s *Suite) TestVl3_basic() { r.Run(`kubectl delete ns ns-vl3`) }) r.Run(`kubectl create ns ns-vl3`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-basic?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-basic?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=2m pod -l app=nsc-kernel -n ns-vl3`) r.Run(`nscs=$(kubectl get pods -l app=nsc-kernel -o go-template --template="{{range .items}}{{.metadata.name}} {{end}}" -n ns-vl3)` + "\n" + `[[ ! -z $nscs ]]`) r.Run(`for nsc in $nscs ` + "\n" + `do` + "\n" + ` ipAddr=$(kubectl exec -n ns-vl3 $nsc -- ifconfig nsm-1)` + "\n" + ` ipAddr=$(echo $ipAddr | grep -Eo 'inet addr:[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'| cut -c 11-)` + "\n" + ` for pinger in $nscs` + "\n" + ` do` + "\n" + ` echo $pinger pings $ipAddr` + "\n" + ` kubectl exec $pinger -n ns-vl3 -- ping -c4 $ipAddr` + "\n" + ` done` + "\n" + `done`) @@ -318,7 +318,7 @@ func (s *Suite) TestVl3_dns() { s.T().Cleanup(func() { r.Run(`kubectl delete ns ns-vl3-dns`) }) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-dns?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-dns?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=2m pod -l app=alpine -n ns-vl3-dns`) r.Run(`nscs=$(kubectl get pods -l app=alpine -o go-template --template="{{range .items}}{{.metadata.name}} {{end}}" -n ns-vl3-dns)` + "\n" + `[[ ! -z $nscs ]]`) r.Run(`for nsc in $nscs ` + "\n" + `do` + "\n" + ` for pinger in $nscs` + "\n" + ` do` + "\n" + ` kubectl exec $pinger -n ns-vl3-dns -- ping -c4 $nsc.vl3-dns -4` + "\n" + ` done` + "\n" + `done`) @@ -329,7 +329,7 @@ func (s *Suite) TestVl3_scale_from_zero() { r.Run(`kubectl delete ns ns-vl3-scale-from-zero`) }) r.Run(`kubectl create ns ns-vl3-scale-from-zero`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-scale-from-zero?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-scale-from-zero?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait -n ns-vl3-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nse-supplier-k8s`) r.Run(`kubectl wait -n ns-vl3-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nsc-kernel`) r.Run(`kubectl wait -n ns-vl3-scale-from-zero --for=condition=ready --timeout=1m pod -l app=nse-vl3-vpp`) @@ -343,7 +343,7 @@ func (s *Suite) TestWebhook() { r.Run(`kubectl delete ns ns-webhook`) }) r.Run(`kubectl create ns ns-webhook`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/webhook?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/webhook?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait --for=condition=ready --timeout=5m pod -l app=nse-kernel -n ns-webhook`) r.Run(`kubectl wait --for=condition=ready --timeout=1m pod -l app=nettools -n ns-webhook`) r.Run(`NSC=$(kubectl get pods -l app=nettools -n ns-webhook --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')`) diff --git a/suites/floating_interdomain/spire/suite.gen.go b/suites/floating_interdomain/spire/suite.gen.go index e658ea49a5..2f6cfe145f 100755 --- a/suites/floating_interdomain/spire/suite.gen.go +++ b/suites/floating_interdomain/spire/suite.gen.go @@ -29,15 +29,15 @@ func (s *Suite) SetupSuite() { r.Run(`[[ ! -z $KUBECONFIG2 ]]`) r.Run(`[[ ! -z $KUBECONFIG3 ]]`) r.Run(`export KUBECONFIG=$KUBECONFIG1`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster1?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster1?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-agent`) r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server`) r.Run(`export KUBECONFIG=$KUBECONFIG2`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster2?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster2?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-agent`) r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server`) r.Run(`export KUBECONFIG=$KUBECONFIG3`) - r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster3?ref=0d9869f4040068f554db54306eb463bb2358e3c7`) + r.Run(`kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/floating_interdomain/spire/cluster3?ref=1c91525906fde1ba14b0c8ef06013602349f7f66`) r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-agent`) r.Run(`kubectl wait -n spire --timeout=1m --for=condition=ready pod -l app=spire-server`) r.Run(`export KUBECONFIG=$KUBECONFIG1 && bundle1=$(kubectl exec spire-server-0 -n spire -- bin/spire-server bundle show -format spiffe)` + "\n" + `export KUBECONFIG=$KUBECONFIG2 && bundle2=$(kubectl exec spire-server-0 -n spire -- bin/spire-server bundle show -format spiffe)` + "\n" + `export KUBECONFIG=$KUBECONFIG3 && bundle3=$(kubectl exec spire-server-0 -n spire -- bin/spire-server bundle show -format spiffe)`) diff --git a/suites/floating_interdomain/suite.gen.go b/suites/floating_interdomain/suite.gen.go index 76f83bbdb5..9f5a306cb7 100755 --- a/suites/floating_interdomain/suite.gen.go +++ b/suites/floating_interdomain/suite.gen.go @@ -55,14 +55,14 @@ func (s *Suite) TestFloatingKernel2Vxlan2Kernel() { r.Run(`kubectl delete ns ${NAMESPACE2}`) }) r.Run(`export KUBECONFIG=$KUBECONFIG2`) - r.Run(`NAMESPACE1=($(kubectl create -f https://raw.githubusercontent.com/networkservicemesh/deployments-k8s/0d9869f4040068f554db54306eb463bb2358e3c7/examples/floating_interdomain/usecases/namespace.yaml)[0])` + "\n" + `NAMESPACE1=${NAMESPACE1:10}`) - r.Run(`cat > kustomization.yaml < kustomization.yaml < patch-nse.yaml < kustomization.yaml < kustomization.yaml < patch-nsc.yaml < kustomization.yaml < kustomization.yaml < kustomization.yaml < patch-nsc.yaml < kustomization.yaml < kustomization.yaml < patch-nse.yaml < kustomization.yaml < kustomization.yaml < patch-nsc.yaml < kustomization.yaml < kustomization.yaml < patch-nse.yaml < kustomization.yaml < kustomization.yaml < patch-nsc.yaml < control-plane.yaml`) - r.Run(`cat > kustomization.yaml < kustomization.yaml < docker-compose.override.yaml < docker-compose.override.yaml < ns-2/second-client.yaml < ns-2/third-client.yaml < ns-2/patch-nse.yaml < ns-2/kustomization.yaml < ns-2/kustomization.yaml < client.yaml < ns-2/second-client.yaml < ns-2/third-client.yaml < ns-2/patch-nse.yaml < ns-2/kustomization.yaml < ns-2/kustomization.yaml < client.yaml <