diff --git a/.gitignore b/.gitignore index 647acc1433..d502c8a9f5 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,7 @@ Vagrantfile *.swp # IntelliJ -.idea/ \ No newline at end of file +.idea/ + +#MacOS system files +*.DS_Store \ No newline at end of file diff --git a/docs/README.md b/docs/README.md index 2531f9640a..491b175d21 100644 --- a/docs/README.md +++ b/docs/README.md @@ -147,14 +147,9 @@ By default, driver tolerates taint `CriticalAddonsOnly` and has `tolerationSecon #### Deploy driver Please see the compatibility matrix above before you deploy the driver -If you want to deploy the stable driver without alpha features: +To deploy the CSI driver: ```sh -kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-0.10" -``` - -If you want to deploy the driver with alpha features: -```sh -kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/alpha/?ref=master" +kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-1.1" ``` Verify driver is running: diff --git a/examples/kubernetes/dynamic-provisioning/README.md b/examples/kubernetes/dynamic-provisioning/README.md index 179af5ab37..afced29391 100644 --- a/examples/kubernetes/dynamic-provisioning/README.md +++ b/examples/kubernetes/dynamic-provisioning/README.md @@ -5,7 +5,7 @@ This example shows how to create a EBS volume and consume it from container dyna 1. Kubernetes 1.13+ (CSI 1.0). -2. The [aws-ebs-csi-driver](https://github.com/kubernetes-sigs/aws-ebs-csi-driver) is installed with `--set enableVolumeScheduling=true`. +2. The [aws-ebs-csi-driver](https://github.com/kubernetes-sigs/aws-ebs-csi-driver) is installed. ## Usage diff --git a/examples/kubernetes/snapshot/specs/classes/snapshotclass.yaml b/examples/kubernetes/snapshot/specs/classes/snapshotclass.yaml index c3670ef4b8..2d15c9849b 100644 --- a/examples/kubernetes/snapshot/specs/classes/snapshotclass.yaml +++ b/examples/kubernetes/snapshot/specs/classes/snapshotclass.yaml @@ -1,4 +1,4 @@ -apiVersion: snapshot.storage.k8s.io/v1beta1 +apiVersion: snapshot.storage.k8s.io/v1 kind: VolumeSnapshotClass metadata: name: csi-aws-vsc diff --git a/examples/kubernetes/snapshot/specs/snapshot-import/README.md b/examples/kubernetes/snapshot/specs/snapshot-import/README.md index 41e7950f26..9d2800e16e 100644 --- a/examples/kubernetes/snapshot/specs/snapshot-import/README.md +++ b/examples/kubernetes/snapshot/specs/snapshot-import/README.md @@ -23,7 +23,7 @@ volumes using the `VolumeSnapshot` custom resources. snapshot in us-west-2b availability zone. ``` -apiVersion: snapshot.storage.k8s.io/v1beta1 +apiVersion: snapshot.storage.k8s.io/v1 kind: VolumeSnapshotContent metadata: name: static-snapshot-content diff --git a/examples/kubernetes/snapshot/specs/snapshot-import/static-snapshot/volume-snapshot-content.yaml b/examples/kubernetes/snapshot/specs/snapshot-import/static-snapshot/volume-snapshot-content.yaml index c284cbab8a..4d507847da 100644 --- a/examples/kubernetes/snapshot/specs/snapshot-import/static-snapshot/volume-snapshot-content.yaml +++ b/examples/kubernetes/snapshot/specs/snapshot-import/static-snapshot/volume-snapshot-content.yaml @@ -1,4 +1,4 @@ -apiVersion: snapshot.storage.k8s.io/v1beta1 +apiVersion: snapshot.storage.k8s.io/v1 kind: VolumeSnapshotContent metadata: name: static-snapshot-content diff --git a/examples/kubernetes/snapshot/specs/snapshot-import/static-snapshot/volume-snapshot.yaml b/examples/kubernetes/snapshot/specs/snapshot-import/static-snapshot/volume-snapshot.yaml index d23597b6a9..0bf9e59163 100644 --- a/examples/kubernetes/snapshot/specs/snapshot-import/static-snapshot/volume-snapshot.yaml +++ b/examples/kubernetes/snapshot/specs/snapshot-import/static-snapshot/volume-snapshot.yaml @@ -1,4 +1,4 @@ -apiVersion: snapshot.storage.k8s.io/v1beta1 +apiVersion: snapshot.storage.k8s.io/v1 kind: VolumeSnapshot metadata: name: static-snapshot-demo diff --git a/examples/kubernetes/snapshot/specs/snapshot/snapshot.yaml b/examples/kubernetes/snapshot/specs/snapshot/snapshot.yaml index b0ea9e027c..6806a5ed5a 100644 --- a/examples/kubernetes/snapshot/specs/snapshot/snapshot.yaml +++ b/examples/kubernetes/snapshot/specs/snapshot/snapshot.yaml @@ -1,4 +1,4 @@ -apiVersion: snapshot.storage.k8s.io/v1beta1 +apiVersion: snapshot.storage.k8s.io/v1 kind: VolumeSnapshot metadata: name: ebs-volume-snapshot