diff --git a/README.md b/README.md index b1038cc8b..d0c1035ea 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ versions. | Kubernetes Version | PD CSI Driver Version | |--------------------|-----------------------| | HEAD | v1.13.x | +| 1.34 | v1.13.x | | 1.29 | v1.12.x | | 1.28 | v1.12.x | | 1.27 | v1.10.x | diff --git a/deploy/kubernetes/base/controller/controller.yaml b/deploy/kubernetes/base/controller/controller.yaml index 302874f82..6048d7b1e 100644 --- a/deploy/kubernetes/base/controller/controller.yaml +++ b/deploy/kubernetes/base/controller/controller.yaml @@ -37,7 +37,6 @@ spec: - "--leader-election" - "--default-fstype=ext4" - "--controller-publish-readonly=true" - - "--feature-gates=VolumeAttributesClass=true" env: - name: PDCSI_NAMESPACE valueFrom: @@ -96,7 +95,6 @@ spec: - "--leader-election" - "--leader-election-namespace=$(PDCSI_NAMESPACE)" - "--handle-volume-inuse-error=false" - - "--feature-gates=VolumeAttributesClass=true" env: - name: PDCSI_NAMESPACE valueFrom: diff --git a/deploy/kubernetes/images/stable-master/image.yaml b/deploy/kubernetes/images/stable-master/image.yaml index b0da81d85..81a60ae22 100644 --- a/deploy/kubernetes/images/stable-master/image.yaml +++ b/deploy/kubernetes/images/stable-master/image.yaml @@ -4,7 +4,7 @@ metadata: name: imagetag-csi-provisioner imageTag: name: registry.k8s.io/sig-storage/csi-provisioner - newTag: "v5.2.0" + newTag: "v6.0.0" --- apiVersion: builtin kind: ImageTagTransformer @@ -20,7 +20,7 @@ metadata: name: imagetag-csi-resizer imageTag: name: registry.k8s.io/sig-storage/csi-resizer - newTag: "v1.13.2" + newTag: "v2.0.0" --- apiVersion: builtin kind: ImageTagTransformer diff --git a/examples/kubernetes/demo-vol-create.yaml b/examples/kubernetes/demo-vol-create.yaml index 5fa536042..8d4c28a1b 100644 --- a/examples/kubernetes/demo-vol-create.yaml +++ b/examples/kubernetes/demo-vol-create.yaml @@ -9,7 +9,7 @@ parameters: provisioned-throughput-on-create: "150Mi" volumeBindingMode: WaitForFirstConsumer --- -apiVersion: storage.k8s.io/v1beta1 +apiVersion: storage.k8s.io/v1 kind: VolumeAttributesClass metadata: name: silver @@ -18,7 +18,7 @@ parameters: iops: "3000" throughput: "150Mi" --- -apiVersion: storage.k8s.io/v1beta1 +apiVersion: storage.k8s.io/v1 kind: VolumeAttributesClass metadata: name: gold @@ -56,4 +56,4 @@ spec: - containerPort: 80 volumeMounts: - mountPath: "/vol" - name: vol \ No newline at end of file + name: vol diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go index 80205785f..b84727503 100644 --- a/test/k8s-integration/main.go +++ b/test/k8s-integration/main.go @@ -639,8 +639,6 @@ func generateGCETestSkip(testParams *testParameters) string { skipString := "\\[Disruptive\\]|\\[Serial\\]" // Skip mount options test until we fix the invalid mount options for xfs. skipString = skipString + "|csi-gcepd-sc-xfs.*provisioning.should.provision.storage.with.mount.options" - // Skip VolumeAttributesClass tests while it's a beta feature. - skipString = skipString + "|\\[Feature:VolumeAttributesClass\\]" v := apimachineryversion.MustParseSemantic(testParams.clusterVersion) @@ -747,8 +745,6 @@ func generateGKETestSkip(testParams *testParameters) string { // Skip mount options test until we fix the invalid mount options for xfs. skipString = skipString + "|csi-gcepd-sc-xfs.*provisioning.should.provision.storage.with.mount.options" - // Skip VolumeAttributesClass tests while it's a beta feature. - skipString = skipString + "|\\[Feature:VolumeAttributesClass\\]" // Skip rwop test when node version is less than 1.32. Test was added only // in 1.32 and above, see tags in diff --git a/test/run-k8s-integration-ci.sh b/test/run-k8s-integration-ci.sh index 46fbd4fc9..d1a4be8a1 100755 --- a/test/run-k8s-integration-ci.sh +++ b/test/run-k8s-integration-ci.sh @@ -124,7 +124,7 @@ else fi if [ "$test_volumeattributesclass" = true ]; then - base_cmd="${base_cmd} --volumeattributesclass-files=hdb-volumeattributesclass.yaml --storageclass-for-vac-file=sc-hdb.yaml --kube-runtime-config=api/all=true" + base_cmd="${base_cmd} --volumeattributesclass-files=hdb-volumeattributesclass.yaml --storageclass-for-vac-file=sc-hdb.yaml" if [ "$deployment_strategy" = "gce" ]; then base_cmd="${base_cmd} --kube-feature-gates=VolumeAttributesClass=true" fi