Skip to content
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 0 additions & 2 deletions deploy/kubernetes/base/controller/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ spec:
- "--leader-election"
- "--default-fstype=ext4"
- "--controller-publish-readonly=true"
- "--feature-gates=VolumeAttributesClass=true"
env:
- name: PDCSI_NAMESPACE
valueFrom:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/images/stable-master/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions examples/kubernetes/demo-vol-create.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -18,7 +18,7 @@ parameters:
iops: "3000"
throughput: "150Mi"
---
apiVersion: storage.k8s.io/v1beta1
apiVersion: storage.k8s.io/v1
kind: VolumeAttributesClass
metadata:
name: gold
Expand Down Expand Up @@ -56,4 +56,4 @@ spec:
- containerPort: 80
volumeMounts:
- mountPath: "/vol"
name: vol
name: vol
4 changes: 0 additions & 4 deletions test/k8s-integration/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/run-k8s-integration-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down