From 25ea609b838b1ddd0b16048606605c7e8e9cb025 Mon Sep 17 00:00:00 2001 From: Artem Glazychev Date: Tue, 19 Dec 2023 20:34:41 +0700 Subject: [PATCH] CSI driver fix Signed-off-by: Artem Glazychev --- .github/workflows/ci.yaml | 2 +- aws-ipv4.yaml | 3 +++ aws-ipv6.yaml | 3 +++ go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3fffa82..0d3483d 100644 --- 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 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/aws-ipv6.yaml b/aws-ipv6.yaml index 8363632..72a64d5 100644 --- 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 index 69b519c..d8ff240 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/networkservicemesh/integration-k8s-aws go 1.20 require ( - github.com/networkservicemesh/integration-tests v0.0.0-20231215093717-7b296ab60a39 + github.com/networkservicemesh/integration-tests v0.0.0-20231228095624-08091f8a5fdf github.com/stretchr/testify v1.8.1 ) diff --git a/go.sum b/go.sum index b608567..cc0a36e 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ 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/networkservicemesh/integration-tests v0.0.0-20231228095624-08091f8a5fdf h1:PW9/Igf5+mjISb7DtfTcYCEIhGPGyRoRuxP/y5GhXgk= +github.com/networkservicemesh/integration-tests v0.0.0-20231228095624-08091f8a5fdf/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=