Merge pull request kubernetes-sigs#441 from nppietra/update-dependencies

Update e2e test dependencies - Kubernetes, Ginkgo, pinned AMI, eksctl

Author: k8s-ci-robot

Dockerfile

@@ -12,27 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ARG AL_VERSION=al23
 FROM --platform=$BUILDPLATFORM golang:1.24 as builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-fsx-csi-driver
+COPY go.* .
+RUN go mod download
 COPY . .
 ARG TARGETOS
 ARG TARGETARCH
 RUN OS=$TARGETOS ARCH=$TARGETARCH make $TARGETOS/$TARGETARCH
 
 # https://github.com/aws/eks-distro-build-tooling/blob/main/eks-distro-base/Dockerfile.minimal-base-csi-ebs#L36
-FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs-builder:latest-al2 as rpm-installer
-
+FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs-builder:latest-${AL_VERSION} as rpm-installer
+ARG AL_VERSION
 # shallow install systemd and the kernel which are not needed in the final container image
 # since lustre is not run as a systemd service and the kernel module is node loaded via the container
 # to avoid pulling in a large tree of unnecessary dependencies
 RUN set -x && \
     enable_extra lustre && \
-    clean_install "kernel systemd" true true && \
-    clean_install lustre-client && \
+    clean_install "kernel systemd" true true; \
+    if [[ "${AL_VERSION}" == "al23" ]]; then \
+    clean_install lustre-client; \
+    else \
+    clean_install lustre; \
+    fi; \
     remove_package "kernel systemd" true && \
     cleanup "fsx-csi"
 
-FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest-al2 AS linux-amazon
+FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest-${AL_VERSION} AS linux-amazon
 
 COPY --from=rpm-installer /newroot /
 

Makefile

@@ -53,7 +53,7 @@ word-hyphen = $(word $2,$(subst -, ,$1))
 .PHONY: linux/$(ARCH) bin/aws-fsx-csi-driver
 linux/$(ARCH): bin/aws-fsx-csi-driver
 bin/aws-fsx-csi-driver: | bin
-	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -ldflags ${LDFLAGS} -o bin/aws-fsx-csi-driver ./cmd/
+	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -mod=mod -ldflags ${LDFLAGS} -o bin/aws-fsx-csi-driver ./cmd/
 
 .PHONY: all
 all: all-image-docker
@@ -89,6 +89,7 @@ image: .image-$(TAG)-$(OS)-$(ARCH)-$(OSVERSION)
 		-t=$(IMAGE):$(TAG)-$(OS)-$(ARCH)-$(OSVERSION) \
 		--build-arg=GOPROXY=$(GOPROXY) \
 		--build-arg=VERSION=$(VERSION) \
+		--build-arg=AL_VERSION=$(AL_VERSION) \
 		`./hack/provenance` \
 		.
 	touch $@

hack/e2e/ecr.sh

@@ -18,7 +18,7 @@ function ecr_build_and_push() {
     set -e
     loudecho "Building and pushing test driver image to ${IMAGE_NAME}:${IMAGE_TAG}"
     aws ecr get-login-password --region "${REGION}" | docker login --username AWS --password-stdin "${AWS_ACCOUNT_ID}".dkr.ecr."${REGION}".amazonaws.com
-    IMAGE=${IMAGE_NAME} TAG=${IMAGE_TAG} OS=linux ARCH=amd64 OSVERSION=amazon make image
+    IMAGE=${IMAGE_NAME} TAG=${IMAGE_TAG} OS=linux ARCH=amd64 OSVERSION=amazon AL_VERSION="al23" make image
     docker tag "${IMAGE_NAME}":"${IMAGE_TAG}"-linux-amd64-amazon "${IMAGE_NAME}":"${IMAGE_TAG}"
     docker push "${IMAGE_NAME}":"${IMAGE_TAG}"
   fi

hack/e2e/kops.sh

@@ -35,6 +35,7 @@ function kops_create_cluster() {
   KOPS_PATCH_FILE=${10}
   KOPS_PATCH_NODE_FILE=${11}
   KOPS_STATE_FILE=${12}
+  AMI_ID=${13}
 
   generate_ssh_key "${SSH_KEY_PATH}"
 
@@ -48,6 +49,7 @@ function kops_create_cluster() {
       --zones "${ZONES}" \
       --node-count="${NODE_COUNT}" \
       --node-size="${INSTANCE_TYPE}" \
+      --image="${AMI_ID}" \
       --kubernetes-version="${K8S_VERSION}" \
       --dry-run \
       -o yaml \

hack/e2e/run.sh

@@ -49,15 +49,18 @@ IMAGE_TAG=${IMAGE_TAG:-${TEST_ID}}
 
 # kops: must include patch version (e.g. 1.19.1)
 # eksctl: mustn't include patch version (e.g. 1.19)
-K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-${K8S_VERSION:-1.23.0}}
-K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-${K8S_VERSION:-1.23}}
+K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-${K8S_VERSION:-1.32.0}}
+K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-${K8S_VERSION:-1.32}}
 
-KOPS_VERSION=${KOPS_VERSION:-1.23.1}
+KOPS_VERSION=${KOPS_VERSION:-1.32.0}
 KOPS_STATE_FILE=${KOPS_STATE_FILE:-s3://k8s-kops-csi-shared-e2e}
 KOPS_PATCH_FILE=${KOPS_PATCH_FILE:-./hack/kops-patch.yaml}
 KOPS_PATCH_NODE_FILE=${KOPS_PATCH_NODE_FILE:-./hack/kops-patch-node.yaml}
 
-EKSCTL_VERSION=${EKSCTL_VERSION:-0.133.0}
+AMI_PARAMETER=${AMI_PARAMETER:-/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64}
+AMI_ID=$(aws ssm get-parameters --names ${AMI_PARAMETER} --region ${AWS_REGION} --query 'Parameters[0].Value' --output text)
+
+EKSCTL_VERSION=${EKSCTL_VERSION:-0.208.0}
 EKSCTL_PATCH_FILE=${EKSCTL_PATCH_FILE:-./hack/eksctl-patch.yaml}
 EKSCTL_ADMIN_ROLE=${EKSCTL_ADMIN_ROLE:-}
 
@@ -99,7 +102,7 @@ loudecho "Installing ginkgo to ${BIN_DIR}"
 GINKGO_BIN=${BIN_DIR}/ginkgo
 if [[ ! -e ${GINKGO_BIN} ]]; then
   pushd /tmp
-  GOPATH=${TEST_DIR} GOBIN=${BIN_DIR} GO111MODULE=on go install github.com/onsi/ginkgo/ginkgo@v1.12.0
+  GOPATH=${TEST_DIR} GOBIN=${BIN_DIR} GO111MODULE=on go install github.com/onsi/ginkgo/v2/ginkgo@v2.21.0
   popd
 fi
 
@@ -121,7 +124,8 @@ if [[ "${CLUSTER_TYPE}" == "kops" ]]; then
     "$KUBECONFIG" \
     "$KOPS_PATCH_FILE" \
     "$KOPS_PATCH_NODE_FILE" \
-    "$KOPS_STATE_FILE"
+    "$KOPS_STATE_FILE" \
+    "$AMI_ID"
   if [[ $? -ne 0 ]]; then
     exit 1
   fi
@@ -177,7 +181,7 @@ eval "EXPANDED_TEST_EXTRA_FLAGS=$TEST_EXTRA_FLAGS"
 set -x
 set +e
 pushd "${TEST_PATH}"
-${GINKGO_BIN} -p -nodes="${GINKGO_NODES}" -v --focus="${GINKGO_FOCUS}" --skip="${GINKGO_SKIP}" ./... -- -kubeconfig="${KUBECONFIG}" -report-dir="${ARTIFACTS}" -gce-zone="${FIRST_ZONE}" "${EXPANDED_TEST_EXTRA_FLAGS}"
+${GINKGO_BIN} -timeout 24h -p -nodes="${GINKGO_NODES}" -v --focus="${GINKGO_FOCUS}" --skip="${GINKGO_SKIP}" ./... -- -kubeconfig="${KUBECONFIG}" -report-dir="${ARTIFACTS}" -gce-zone="${FIRST_ZONE}" "${EXPANDED_TEST_EXTRA_FLAGS}"
 TEST_PASSED=$?
 set -e
 set +x

hack/kops-patch-node.yaml

@@ -1,4 +1,3 @@
 spec:
-  image: 137112412989/amzn2-ami-kernel-5.10-hvm-2.0.20240412.0-x86_64-gp2
   instanceMetadata:
     httpPutResponseHopLimit: 3

tester/e2e-test-config.yaml

@@ -65,10 +65,10 @@ uninstall: |
   helm delete aws-fsx-csi-driver --namespace kube-system
 
 test: |
-  go install github.com/onsi/ginkgo/ginkgo
+  go install github.com/onsi/ginkgo/v2/ginkgo
   export KUBECONFIG=$HOME/.kube/config
   cluster_name=test-cluster-{{TEST_ID}}.k8s.local
   skip="\[Disruptive\]\
   |subPath.should.be.able.to.unmount.after.the.subpath.directory.is.deleted\
   |should.not.mount./.map.unused.volumes.in.a.pod"
-  ginkgo -p -nodes=8 -skip=$skip -v ./tests/e2e -- --cluster-name=$cluster_name --region=us-west-2 --report-dir=$ARTIFACTS
+  ginkgo -timeout 24h -p -nodes=8 -skip=$skip -v ./tests/e2e -- --cluster-name=$cluster_name --region=us-west-2 --report-dir=$ARTIFACTS

tests/e2e/cloud.go

@@ -15,46 +15,53 @@ limitations under the License.
 package e2e
 
 import (
+	"context"
 	"fmt"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/service/s3"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/service/ec2"
+	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	fsx "sigs.k8s.io/aws-fsx-csi-driver/pkg/cloud"
 )
 
 type cloud struct {
-	ec2client *ec2.EC2
-	s3client  *s3.S3
+	ec2client *ec2.Client
+	s3client  *s3.Client
 	fsx.Cloud
 }
 
 func NewCloud(region string) *cloud {
-	config := &aws.Config{
-		Region: aws.String(region),
+	config, _ := config.LoadDefaultConfig(context.Background(), config.WithRegion(region))
+
+	c, err := fsx.NewCloud(region)
+	if err != nil {
+		fmt.Sprintf("could not get NewCloud: %v", err)
+		return nil
 	}
-	sess := session.Must(session.NewSession(config))
 
 	return &cloud{
-		ec2.New(sess),
-		s3.New(sess),
-		fsx.NewCloud(region),
+		ec2.NewFromConfig(config),
+		s3.NewFromConfig(config),
+		c,
 	}
 }
 
-func (c *cloud) getNodeInstance(clusterName string) (*ec2.Instance, error) {
+func (c *cloud) getNodeInstance(clusterName string) (*ec2types.Instance, error) {
 	request := &ec2.DescribeInstancesInput{
-		Filters: []*ec2.Filter{
+		Filters: []ec2types.Filter{
 			{
 				Name:   aws.String("tag:KubernetesCluster"),
-				Values: []*string{aws.String(clusterName)},
+				Values: []string{clusterName},
 			},
 		},
 	}
 
-	instances := []*ec2.Instance{}
-	response, err := c.ec2client.DescribeInstances(request)
+	instances := []ec2types.Instance{}
+	ctx := context.Background()
+	response, err := c.ec2client.DescribeInstances(ctx, request)
 	if err != nil {
 		return nil, err
 	}
@@ -66,15 +73,19 @@ func (c *cloud) getNodeInstance(clusterName string) (*ec2.Instance, error) {
 		return nil, fmt.Errorf("no instances in cluster %q found", clusterName)
 	}
 
-	return instances[0], nil
+	return &instances[0], nil
 }
 
-func (c *cloud) createS3Bucket(name string) error {
+func (c *cloud) createS3Bucket(name string, region string) error {
 	request := &s3.CreateBucketInput{
 		Bucket: aws.String(name),
+		CreateBucketConfiguration: &types.CreateBucketConfiguration{
+			LocationConstraint: types.BucketLocationConstraint(region),
+		},
 	}
 
-	_, err := c.s3client.CreateBucket(request)
+	ctx := context.Background()
+	_, err := c.s3client.CreateBucket(ctx, request)
 	if err != nil {
 		return err
 	}
@@ -86,14 +97,15 @@ func (c *cloud) deleteS3Bucket(name string) error {
 		Bucket: aws.String(name),
 	}
 
-	_, err := c.s3client.DeleteBucket(request)
+	ctx := context.Background()
+	_, err := c.s3client.DeleteBucket(ctx, request)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func getSecurityGroupIds(node *ec2.Instance) []string {
+func getSecurityGroupIds(node *ec2types.Instance) []string {
 	groups := []string{}
 	for _, sg := range node.SecurityGroups {
 		groups = append(groups, *sg.GroupId)

tests/e2e/conformance_test.go

@@ -18,13 +18,12 @@ import (
 	"context"
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kubernetes/test/e2e/framework"
 	storageframework "k8s.io/kubernetes/test/e2e/storage/framework"
 	"k8s.io/kubernetes/test/e2e/storage/testsuites"
-	"k8s.io/kubernetes/test/e2e/storage/utils"
 	fsx "sigs.k8s.io/aws-fsx-csi-driver/pkg/cloud"
 	fsxcsidriver "sigs.k8s.io/aws-fsx-csi-driver/pkg/driver"
 )
@@ -35,8 +34,7 @@ type fsxVolume struct {
 	dnsName      string
 }
 
-func (v *fsxVolume) DeleteVolume() {
-	ctx := context.Background()
+func (v *fsxVolume) DeleteVolume(ctx context.Context) {
 	err := v.c.DeleteFileSystem(ctx, v.fileSystemId)
 	if err != nil {
 		Fail(fmt.Sprintf("failed to delete filesystem %s", err))
@@ -72,21 +70,15 @@ func (e *fsxDriver) GetDriverInfo() *storageframework.DriverInfo {
 
 func (e *fsxDriver) SkipUnsupportedTest(storageframework.TestPattern) {}
 
-func (e *fsxDriver) PrepareTest(f *framework.Framework) (*storageframework.PerTestConfig, func()) {
-	By("PrepareTest")
-	cancelPodLogs := utils.StartPodLogs(f, f.Namespace)
-
+func (e *fsxDriver) PrepareTest(ctx context.Context, f *framework.Framework) *storageframework.PerTestConfig {
 	return &storageframework.PerTestConfig{
-			Driver:    e,
-			Prefix:    "fsx",
-			Framework: f,
-		}, func() {
-			By("Cleaning up FSx CSI driver")
-			cancelPodLogs()
-		}
+		Driver:    e,
+		Prefix:    "fsx",
+		Framework: f,
+	}
 }
 
-func (e *fsxDriver) CreateVolume(config *storageframework.PerTestConfig, volType storageframework.TestVolType) storageframework.TestVolume {
+func (e *fsxDriver) CreateVolume(ctx context.Context, config *storageframework.PerTestConfig, volType storageframework.TestVolType) storageframework.TestVolume {
 	c := NewCloud(*region)
 	instance, err := c.getNodeInstance(*clusterName)
 	if err != nil {
@@ -95,11 +87,11 @@ func (e *fsxDriver) CreateVolume(config *storageframework.PerTestConfig, volType
 	securityGroupIds := getSecurityGroupIds(instance)
 	subnetId := *instance.SubnetId
 
-	ctx := context.Background()
 	options := &fsx.FileSystemOptions{
-		CapacityGiB:      3600,
-		SubnetId:         subnetId,
-		SecurityGroupIds: securityGroupIds,
+		CapacityGiB:           3600,
+		SubnetId:              subnetId,
+		SecurityGroupIds:      securityGroupIds,
+		FileSystemTypeVersion: "2.15",
 	}
 	ns := config.Framework.Namespace.Name
 	volumeName := fmt.Sprintf("fsx-e2e-test-volume-%s", ns)
@@ -182,7 +174,10 @@ var csiTestSuites = []func() storageframework.TestSuite{
 
 var _ = Describe("FSx CSI Driver Conformance", func() {
 	driver := InitFSxCSIDriver()
-	Context(storageframework.GetDriverNameWithFeatureTags(driver), func() {
+
+	args := storageframework.GetDriverNameWithFeatureTags(driver)
+	args = append(args, func() {
 		storageframework.DefineTestSuites(driver, csiTestSuites)
 	})
+	framework.Context(args...)
 })