Merge pull request #222 from jsafrane/rebase-v1.18.0

STOR-1167: Rebase to v1.18.0 for OCP 4.14

CHANGELOG.md

@@ -1,3 +1,78 @@
+# v1.17.0
+### Urgent Upgrade Notes
+*(No, really, you MUST read this before you upgrade)*
+
+[`k8s.gcr.io` will be redirected on Monday March 20th](https://kubernetes.io/blog/2023/03/10/image-registry-redirect/), and may stop working entirely in the near future. If you are using `k8s.gcr.io` you MUST [move to `registry.k8s.io`](https://kubernetes.io/blog/2023/02/06/k8s-gcr-io-freeze-announcement/) to continue receiving support.
+
+Issues related to `k8s.gcr.io` will no longer be accepted. `public.ecr.aws` and `registry.k8s.io` images are unaffected and remain supported as per [the support policy](https://github.com/kubernetes-sigs/aws-ebs-csi-driver#support).
+
+### Notable Changes
+* Add support for XFS custom block sizes ([#1523](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1523), [@ConnorJC3](https://github.com/ConnorJC3))
+* Add support for instances with more than 52 volumes attached ([#1518](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1518), [@ConnorJC3](https://github.com/ConnorJC3))
+
+### Bug Fixes
+* Fix improper handling of manually-mounted volumes ([#1518](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1518), [@ConnorJC3](https://github.com/ConnorJC3))
+
+### Improvements
+* Log driver version in lower verbosities ([#1525](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1525), [@torredil](https://github.com/torredil))
+* Upgrade dependencies ([#1529](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1529), [@torredil](https://github.com/torredil))
+
+# v1.16.1
+### Notable Changes
+* Security fixes
+
+# v1.16.0
+### Notable Changes
+* Add support for JSON logging ([#1467](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1467), [@torredil](https://github.com/torredil))
+    * `--logging-format` flag has been added to set the log format. Valid values are `text` and `json`. The default value is `text`.
+    * `--logtostderr` is deprecated.
+    * Long arguments prefixed with `-` are no longer supported, and must be prefixed with `--`. For example, `--volume-attach-limit` instead of `-volume-attach-limit`.
+* k8s.gcr.io -> registry.k8s.io ([#1488](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1488), [@ConnorJC3](https://github.com/ConnorJC3))
+    * The GCR manifests now use `registry.k8s.io` instead of `k8s.gcr.io` for the image repository. For users that rely on it, the images will still be pushed to `k8s.gcr.io` for the forseeable future, but we recommend migration to `registry.k8s.io` as soon as reasonably possible. For more information, see [registry.k8s.io: faster, cheaper and Generally Available (GA)](https://kubernetes.io/blog/2022/11/28/registry-k8s-io-faster-cheaper-ga/).
+* The sidecars have been updated. The new versions are:
+    - csi-provisioner: `v3.4.0`
+    - csi-attacher: `v4.1.0`
+    - csi-snapshotter: `v6.2.1`
+    - livenessprobe: `v2.9.0`
+    - csi-resizer: `v1.7.0`
+    - node-driver-registrar: `v2.7.0`
+
+### Improvements
+* Bump CI k8s version to 1.26.1 (and other CI tools upgrades) ([#1487](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1487), [@ConnorJC3](https://github.com/ConnorJC3))
+* Bump GitHub Actions workflows ([#1491](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1491), [@ConnorJC3](https://github.com/ConnorJC3))
+* Upgrade golangci-lint ([#1505](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1505), [@torredil](https://github.com/torredil))
+
+### Bug Fixes
+* Use test driver image when testing upgrades with CT ([#1486](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1486), [@torredil](https://github.com/torredil))
+* Disable buildx provenance ([#1491](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1491), [@ConnorJC3](https://github.com/ConnorJC3))
+
+# v1.15.1
+### Notable Changes
+* Security fixes
+
+# v1.15.0
+### Notable Changes
+* Support specifying block size for filesystem format ([#1452](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1452), [@ConnorJC3](https://github.com/ConnorJC3))
+* Change default sidecars to EKS-D ([#1475](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1475), [@ConnorJC3](https://github.com/ConnorJC3), [@torredil](https://github.com/torredil))
+* The sidecars have been updated. The new versions are:
+    - csi-provisioner: `v3.3.0`
+    - csi-attacher: `v4.0.0`
+    - csi-snapshotter: `v6.1.0`
+    - livenessprobe: `v2.8.0`
+    - csi-resizer: `v1.6.0`
+    - node-driver-registrar: `v2.6.2`
+
+### Bug Fixes
+* Manually setup remote for CT on Prow ([#1473](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1473), [@ConnorJC3](https://github.com/ConnorJC3))
+* Fix volume limits for `m6id` and `x2idn` instance types ([#1463](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1463), [@talnevo](https://github.com/talnevo))
+
+### Improvements
+* Update compatibility info in README ([#1465](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1465), [@torredil](https://github.com/torredil))
+
+### Acknowledgments
+* We would like to sincerely thank:
+[@talnevo](https://github.com/talnevo)
+
 # v1.14.1
 ### Bug Fixes
 * (Cherry-Pick) Fixed handling of volume limits for instance types m6id and x2idn

Dockerfile

@@ -15,7 +15,7 @@
 # See
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
 # for info on BUILDPLATFORM, TARGETOS, TARGETARCH, etc.
-FROM --platform=$BUILDPLATFORM golang:1.19 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.20 AS builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
 COPY go.* .
 ARG GOPROXY

Makefile

@@ -27,7 +27,7 @@ undefine KUBERNETES_SERVICE_PORT_HTTPS
 # Carry: VERSION is set by CI to go version, not CSI driver version
 undefine VERSION
 
-VERSION?=v1.15.0
+VERSION?=v1.18.0
 
 PKG=github.com/kubernetes-sigs/aws-ebs-csi-driver
 GIT_COMMIT?=$(shell git rev-parse HEAD)
@@ -117,6 +117,7 @@ image: .image-$(TAG)-$(OS)-$(ARCH)-$(OSVERSION)
 		-t=$(IMAGE):$(TAG)-$(OS)-$(ARCH)-$(OSVERSION) \
 		--build-arg=GOPROXY=$(GOPROXY) \
 		--build-arg=VERSION=$(VERSION) \
+		`./hack/provenance` \
 		.
 	touch $@
 
@@ -128,7 +129,7 @@ bin /tmp/helm /tmp/kubeval:
 	@mkdir -p $@
 
 bin/helm: | /tmp/helm bin
-	@curl -o /tmp/helm/helm.tar.gz -sSL https://get.helm.sh/helm-v3.10.1-${GOOS}-amd64.tar.gz
+	@curl -o /tmp/helm/helm.tar.gz -sSL https://get.helm.sh/helm-v3.11.2-${GOOS}-amd64.tar.gz
 	@tar -zxf /tmp/helm/helm.tar.gz -C bin --strip-components=1
 	@rm -rf /tmp/helm/*
 
@@ -138,11 +139,11 @@ bin/kubeval: | /tmp/kubeval bin
 	@rm -rf /tmp/kubeval/*
 
 bin/mockgen: | bin
-	go install github.com/golang/mock/mockgen@v1.5.0
+	go install github.com/golang/mock/mockgen@v1.6.0
 
 bin/golangci-lint: | bin
 	echo "Installing golangci-lint..."
-	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.51.1
+	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.51.2
 
 .PHONY: kubeval
 kubeval: bin/kubeval
@@ -188,12 +189,6 @@ test-e2e-multi-az:
 	GINKGO_FOCUS="\[ebs-csi-e2e\] \[multi-az\]" \
 	./hack/e2e/run.sh
 
-.PHONY: test-e2e-migration
-test-e2e-migration:
-# TODO: Remove once this test is removed from test-infra upstream
-# https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/aws-ebs-csi-driver/aws-ebs-csi-driver-presubmits.yaml
-	echo "succeed"
-
 .PHONY: test-e2e-external
 test-e2e-external:
 	AWS_REGION=us-west-2 \
@@ -219,6 +214,22 @@ test-e2e-external-eks:
 	GINKGO_SKIP="\[Disruptive\]|\[Serial\]" \
 	./hack/e2e/run.sh
 
+.PHONY: test-e2e-external-eks-windows
+test-e2e-external-eks-windows:
+	CLUSTER_TYPE=eksctl \
+	WINDOWS=true \
+	HELM_VALUES_FILE="./hack/values_eksctl.yaml" \
+	HELM_EXTRA_FLAGS='--set=controller.k8sTagClusterId=$$CLUSTER_NAME' \
+	EKSCTL_ADMIN_ROLE="Infra-prod-KopsDeleteAllLambdaServiceRoleF1578477-1ELDFIB4KCMXV" \
+	AWS_REGION=us-west-2 \
+	AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b \
+	TEST_PATH=./tests/e2e-kubernetes/... \
+	GINKGO_FOCUS="External.Storage" \
+	GINKGO_SKIP="\[Disruptive\]|\[Serial\]|\[LinuxOnly\]|\[Feature:VolumeSnapshotDataSource\]|\(xfs\)|\(ext4\)|\(block volmode\)" \
+	GINKGO_PARALLEL=15 \
+	NODE_OS_DISTRO="windows" \
+	./hack/e2e/run.sh
+
 .PHONY: test-helm-chart
 test-helm-chart:
 	AWS_REGION=us-west-2 \