Merge branch 'kubernetes-sigs:master' into hd-mw

Author: karkunpavan

CHANGELOG/CHANGELOG-1.15.md

@@ -1,3 +1,11 @@
+# v1.15.4 - Changelog since v1.15.3
+- [release-1.15] [metrics] Fix panic during metrics manager startup by @k8s-infra-cherrypick-robot in https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1898
+
+# v1.15.3 - Changelog since v1.15.2
+* [release-1.15] Don't overwrite libc in distroless debian base image by @k8s-infra-cherrypick-robot in https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1884
+* [release-1.15] Refactor metric defer() statements to gRPC metric interceptor by @k8s-infra-cherrypick-robot in https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1886
+* Automated cherry pick of #1875: Require VACs to use SI units by @travisyx in https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1892
+
 # v1.15.2 - Changelog since v1.15.1
 
 - [release-1.15] Map RESOURCE_OPERATION_RATE_EXCEEDED to ResourceExhausted by @k8s-infra-cherrypick-robot in #1848

deploy/kubernetes/images/prow-stable-sidecar-rc-master/image.yaml

@@ -48,6 +48,6 @@ metadata:
 imageTag:
   name: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/k8s-staging-cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
-  newTag: "v1.15.3-rc2"
+  newTag: "v1.15.4-rc1"
 ---
 

test/k8s-integration/main.go

@@ -688,8 +688,8 @@ func generateGKETestSkip(testParams *testParameters) string {
 		skipString = skipString + "|should.provision.correct.filesystem.size.when.restoring.snapshot.to.larger.size.pvc"
 	}
 
-	// VolumeAttributesClasses were promoted to beta in 1.31
-	if curVer.lessThan(mustParseVersion("1.31.0")) {
+	// VolumeAttributesClasses were promoted to beta in 1.31, but is not supported on managed driver.
+	if curVer.lessThan(mustParseVersion("1.31.0")) || testParams.useGKEManagedDriver {
 		skipString = skipString + "|VolumeAttributesClass"
 	}
 
@@ -814,13 +814,9 @@ func runTestsWithConfig(testParams *testParameters, testConfigArg, reportPrefix
 		focuses = append(focuses, "VolumeSnapshotDataSource")
 	}
 
-	// If testParams.volumeAttributesClassFile is empty, then VAC tests will be automatically skipped. Otherwise confirm
-	// the right tests are run.
-	if testParams.volumeAttributesClassFile != "" && strings.Contains(skip, "VolumeAttributesClass") {
-		return fmt.Errorf("VolumeAttributesClass file %s specified, but VolumeAttributesClass tests are skipped: %s", testParams.volumeAttributesClassFile, skip)
-	}
-	if testParams.volumeAttributesClassFile != "" {
-		// If there is a VolumeAttributesClass file, run VAC tests
+	// testParams.volumeAttributesClassFile is always set, so rely on test skip to determine if VAC tests should
+	// be run.
+	if testParams.volumeAttributesClassFile != "" && !strings.Contains(skip, "VolumeAttributesClass") {
 		focuses = append(focuses, "VolumeAttributesClass")
 	}