diff --git a/aws-ipv4.yaml b/aws-ipv4.yaml index e39140d..77edb0c 100644 --- a/aws-ipv4.yaml +++ b/aws-ipv4.yaml @@ -14,6 +14,9 @@ addons: - name: vpc-cni - name: coredns - name: kube-proxy + - name: aws-ebs-csi-driver + attachPolicyARNs: + - arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy iam: withOIDC: true diff --git a/go.mod b/go.mod index 69b519c..3937524 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,9 @@ module github.com/networkservicemesh/integration-k8s-aws go 1.20 -require ( - github.com/networkservicemesh/integration-tests v0.0.0-20231215093717-7b296ab60a39 - github.com/stretchr/testify v1.8.1 -) +require github.com/networkservicemesh/integration-tests v0.0.0-20231219115352-a3a362bd381d + +replace github.com/networkservicemesh/integration-tests => github.com/glazychev-art/integration-tests v0.0.0-20231220043320-2f7102a3691d require ( github.com/davecgh/go-spew v1.1.1 // indirect @@ -15,6 +14,7 @@ require ( github.com/networkservicemesh/gotestmd v0.0.0-20220628095933-eabbdc09e0dc // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect + github.com/stretchr/testify v1.8.1 // indirect golang.org/x/sys v0.6.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index b608567..37f0d71 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/glazychev-art/integration-tests v0.0.0-20231220043320-2f7102a3691d h1:ghPNHuj/kdk4u//+3PqNwEyk9xckSuLpD3DbxArN4/k= +github.com/glazychev-art/integration-tests v0.0.0-20231220043320-2f7102a3691d/go.mod h1:o3+iZ6iQvk2ukrAxQhaDOXUPhhQRW4O9BMi6YolZ4pI= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= @@ -14,8 +16,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/networkservicemesh/gotestmd v0.0.0-20220628095933-eabbdc09e0dc h1:1L/OisEFsOyhwaqeJpYmM1nlJ2dBusUMiszPDBlUip0= github.com/networkservicemesh/gotestmd v0.0.0-20220628095933-eabbdc09e0dc/go.mod h1:8EWnekTRNX+NxBdTFE24WqUoM7SgJHbiafDBrIIdOmQ= -github.com/networkservicemesh/integration-tests v0.0.0-20231215093717-7b296ab60a39 h1:QQkl/ktXbIS8T3abVGFG8j5HSYwoKIOIr6HE5+Ij8fE= -github.com/networkservicemesh/integration-tests v0.0.0-20231215093717-7b296ab60a39/go.mod h1:o3+iZ6iQvk2ukrAxQhaDOXUPhhQRW4O9BMi6YolZ4pI= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/main_test.go b/main_test.go index fa094e5..57049a6 100644 --- a/main_test.go +++ b/main_test.go @@ -21,37 +21,10 @@ package main_test import ( "testing" - "github.com/stretchr/testify/suite" - "github.com/networkservicemesh/integration-tests/extensions/parallel" - "github.com/networkservicemesh/integration-tests/suites/afxdp" "github.com/networkservicemesh/integration-tests/suites/basic" - "github.com/networkservicemesh/integration-tests/suites/features" - "github.com/networkservicemesh/integration-tests/suites/heal" - "github.com/networkservicemesh/integration-tests/suites/memory" - "github.com/networkservicemesh/integration-tests/suites/observability" ) -func TestRunFeatureSuite(t *testing.T) { - parallel.Run(t, new(features.Suite), "TestScale_from_zero", "TestVl3_dns", "TestVl3_scale_from_zero", "TestNse_composition", "TestSelect_forwarder") -} - func TestRunBasicSuite(t *testing.T) { parallel.Run(t, new(basic.Suite)) } - -func TestRunAfxdpSuite(t *testing.T) { - parallel.Run(t, new(afxdp.Suite)) -} - -func TestRunMemorySuite(t *testing.T) { - parallel.Run(t, new(memory.Suite)) -} - -func TestRunHealSuite(t *testing.T) { - suite.Run(t, new(heal.Suite)) -} - -func TestRunObservabilitySuite(t *testing.T) { - suite.Run(t, new(observability.Suite)) -}