diff --git a/Gopkg.lock b/Gopkg.lock index 1bf8f2a46..d2d4eacc1 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1383,9 +1383,11 @@ "k8s.io/client-go/kubernetes", "k8s.io/client-go/rest", "k8s.io/client-go/tools/clientcmd", + "k8s.io/cloud-provider/volume/helpers", "k8s.io/klog", "k8s.io/kubernetes/pkg/client/conditions", "k8s.io/kubernetes/pkg/util/mount", + "k8s.io/kubernetes/pkg/util/resizefs", "k8s.io/kubernetes/pkg/volume", "k8s.io/kubernetes/test/e2e/framework", "k8s.io/kubernetes/test/e2e/framework/log", diff --git a/examples/rbd/storageclass.yaml b/examples/rbd/storageclass.yaml index aeb3a9a95..9249f2f91 100644 --- a/examples/rbd/storageclass.yaml +++ b/examples/rbd/storageclass.yaml @@ -29,6 +29,8 @@ parameters: # to the 'pool'. csi.storage.k8s.io/provisioner-secret-name: csi-rbd-secret csi.storage.k8s.io/provisioner-secret-namespace: default + csi.storage.k8s.io/controller-expand-secret-name: csi-rbd-secret + csi.storage.k8s.io/controller-expand-secret-namespace: default csi.storage.k8s.io/node-stage-secret-name: csi-rbd-secret csi.storage.k8s.io/node-stage-secret-namespace: default # Specify the filesystem type of the volume. If not specified, @@ -37,5 +39,6 @@ parameters: # uncomment the following to use rbd-nbd as mounter on supported nodes # mounter: rbd-nbd reclaimPolicy: Delete +allowVolumeExpansion: true mountOptions: - discard diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 3a3db447a..2081fd0c1 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -121,6 +121,7 @@ k8s-sidecar) copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-snapshotter:v1.1.0 $"${K8S_IMAGE_REPO}"/csi-snapshotter:v1.2.1 copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-provisioner:v1.3.0 "${K8S_IMAGE_REPO}"/csi-provisioner:v1.3.0 copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-node-driver-registrar:v1.1.0 "${K8S_IMAGE_REPO}"/csi-node-driver-registrar:v1.1.0 + copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-resizer:v0.3.0 "${K8S_IMAGE_REPO}"/csi-resizer:v0.3.0 ;; clean) minikube delete