Merge pull request kubernetes-csi#48 from pohly/release-1.1.0-deploym…

…ents release 1.1.0 deployments
zhucan · May 3, 2019 · 670a96b · 670a96b
2 parents 355caeb + 05e1a04
commit 670a96b
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 10 deletions.
diff --git a/deploy/kubernetes-1.13/hostpath/csi-hostpath-plugin.yaml b/deploy/kubernetes-1.13/hostpath/csi-hostpath-plugin.yaml
@@ -37,7 +37,7 @@ spec:
       hostNetwork: true
       containers:
         - name: node-driver-registrar
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2
+          image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
           lifecycle:
             preStop:
               exec:
@@ -63,7 +63,7 @@ spec:
             name: csi-data-dir
 
         - name: hostpath
-          image: quay.io/k8scsi/hostpathplugin:canary
+          image: quay.io/k8scsi/hostpathplugin:v1.1.0
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"

diff --git a/deploy/kubernetes-1.14 b/deploy/kubernetes-1.14
diff --git a/deploy/master/README.md → deploy/kubernetes-1.14/README.md b/deploy/master/README.md → deploy/kubernetes-1.14/README.md
@@ -1,11 +1,8 @@
-The deployment for master uses CSI 1.0 and thus is incompatible with
-Kubernetes < 1.13.
+The deployment for Kubernetes 1.14 uses CSI 1.0 and thus is
+incompatible with Kubernetes < 1.13.
 
 It uses the APIs for CSIDriverInfo and CSINodeInfo that were
 introduced in Kubernetes 1.14, so features depending on those (like
 topology) will not work on Kubernetes 1.13. But because this example
 deployment does not enable those features, it can run on Kubernetes
 1.13.
-
-WARNING: this example uses the "canary" images. It can break at any
-time.
diff --git a/deploy/master/deploy-hostpath.sh → deploy/kubernetes-1.14/deploy-hostpath.sh b/deploy/master/deploy-hostpath.sh → deploy/kubernetes-1.14/deploy-hostpath.sh
diff --git a/...aster/hostpath/csi-hostpath-attacher.yaml → ...-1.14/hostpath/csi-hostpath-attacher.yaml b/...aster/hostpath/csi-hostpath-attacher.yaml → ...-1.14/hostpath/csi-hostpath-attacher.yaml
@@ -40,7 +40,7 @@ spec:
       serviceAccountName: csi-attacher
       containers:
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v1.1.0
+          image: quay.io/k8scsi/csi-attacher:v1.1.1
           args:
             - --v=5
             - --csi-address=/csi/csi.sock

diff --git a/.../master/hostpath/csi-hostpath-plugin.yaml → ...es-1.14/hostpath/csi-hostpath-plugin.yaml b/.../master/hostpath/csi-hostpath-plugin.yaml → ...es-1.14/hostpath/csi-hostpath-plugin.yaml
@@ -63,7 +63,7 @@ spec:
             name: csi-data-dir
 
         - name: hostpath
-          image: quay.io/k8scsi/hostpathplugin:canary # TODO: replace with v1.1.0 when it is cut
+          image: quay.io/k8scsi/hostpathplugin:v1.1.0
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"

diff --git a/...er/hostpath/csi-hostpath-provisioner.yaml → ...14/hostpath/csi-hostpath-provisioner.yaml b/...er/hostpath/csi-hostpath-provisioner.yaml → ...14/hostpath/csi-hostpath-provisioner.yaml
diff --git a/...er/hostpath/csi-hostpath-snapshotter.yaml → ...14/hostpath/csi-hostpath-snapshotter.yaml b/...er/hostpath/csi-hostpath-snapshotter.yaml → ...14/hostpath/csi-hostpath-snapshotter.yaml
diff --git a/...master/hostpath/csi-hostpath-testing.yaml → ...s-1.14/hostpath/csi-hostpath-testing.yaml b/...master/hostpath/csi-hostpath-testing.yaml → ...s-1.14/hostpath/csi-hostpath-testing.yaml
diff --git a/...apshotter/csi-hostpath-snapshotclass.yaml → ...apshotter/csi-hostpath-snapshotclass.yaml b/...apshotter/csi-hostpath-snapshotclass.yaml → ...apshotter/csi-hostpath-snapshotclass.yaml