CSI driver fix

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>
networkservicemesh · Dec 26, 2023 · b049f94 · b049f94
1 parent 47bba18
commit b049f94
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 34 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -86,7 +86,7 @@ jobs:
         if: ${{ always() }}
         working-directory: ${{ github.repository }}
         run: |
-          eksctl delete cluster -f aws-${{ matrix.ip_family }}.yaml
+          eksctl delete cluster -f aws-${{ matrix.ip_family }}.yaml --disable-nodegroup-eviction
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git 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/aws-ipv6.yaml b/aws-ipv6.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
@@ -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-20231225183030-ae1c8ff83f4d
+
+replace github.com/networkservicemesh/integration-tests => github.com/glazychev-art/integration-tests v0.0.0-20231226134539-97bd796e7069
 
 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
@@ -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-20231226134539-97bd796e7069 h1:yoI+YwZWYg2ZJoXZJv5QD01FfQSSevUA0UFAuKcm90I=
+github.com/glazychev-art/integration-tests v0.0.0-20231226134539-97bd796e7069/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
@@ -21,37 +21,30 @@ 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))
+	parallel.Run(t, new(features.Suite), "TestScale_from_zero", "TestVl3_dns", "TestVl3_scale_from_zero", "TestNse_composition", "TestSelect_forwarder", "TestScaled_registry")
 }
 
-func TestRunHealSuite(t *testing.T) {
-	suite.Run(t, new(heal.Suite))
-}
-
-func TestRunObservabilitySuite(t *testing.T) {
-	suite.Run(t, new(observability.Suite))
-}
+//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))
+//}