Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
10 changes: 5 additions & 5 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 @@ -53,7 +53,7 @@ spec:
- name: nginx
image: nginx:1.14.2
ports:
- containerPort: 80
- containerPort: 80
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove the space change? This seems unrelated.

volumeMounts:
- mountPath: "/vol"
name: vol
- mountPath: "/vol"
name: vol
2 changes: 0 additions & 2 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\\]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At line 750 there is another skipString = skipString + "|\[Feature:VolumeAttributesClass\]", can you remove that line as well?


v := apimachineryversion.MustParseSemantic(testParams.clusterVersion)

Expand Down