Skip to content

Commit 28948fc

Browse files
committed
deploy: update example for use with current images
The external-provisioner no longer accepts the --provisioner parameter. While at it, parameters are now the same as in external-attacher (same style, -v=5). Right now it is still possible to use the same deployment for Kubernetes 1.13 and Kubernetes master (aka "latest"). But soon we will have to maintain two different deployments, one for Kubernetes 1.13 and one for Kubernetes 1.14. Moving the deployment script into a sub-directory is a first step towards that. The Kubernetes-CSI CI scripts expect to find directories or symlinks to directories name "kubernetes-x.yy" and uses those when testing against that Kubernetes version. If the same deployment works for multiple Kubernetes releases, then the directory name is the oldest supported Kubernetes release and the symlinks get added once it becomes known that those also work.
1 parent 9370d33 commit 28948fc

7 files changed

+17
-16
lines changed

deploy/kubernetes-1.13/README.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
The deployment for Kubernetes 1.13 uses CSI 1.0 and this is
2+
incompatible with older Kubernetes releases.
3+
4+
It relies on the CRDs for CSIDriverInfo and CSINodeInfo, which are
5+
about to be replaced with builtin APIs in Kubernetes 1.14. It can be
6+
deployed on Kubernetes 1.14 if the CRDs are installed, but features
7+
relying on these CRDs (like topology) are unlikely to work.
8+
9+
Kubernetes 1.14 will need a different deployment.
File renamed without changes.

deploy/hostpath/csi-hostpath-attacher.yaml renamed to deploy/kubernetes-1.13/hostpath/csi-hostpath-attacher.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ spec:
4343
image: quay.io/k8scsi/csi-attacher:v1.0.1
4444
args:
4545
- --v=5
46-
- --csi-address=$(ADDRESS)
47-
env:
48-
- name: ADDRESS
49-
value: /csi/csi.sock
46+
- --csi-address=/csi/csi.sock
5047
volumeMounts:
5148
- mountPath: /csi
5249
name: socket-dir

deploy/hostpath/csi-hostpath-provisioner.yaml renamed to deploy/kubernetes-1.13/hostpath/csi-hostpath-provisioner.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,9 @@ spec:
4242
- name: csi-provisioner
4343
image: quay.io/k8scsi/csi-provisioner:v1.0.1
4444
args:
45-
- "--provisioner=csi-hostpath"
46-
- "--csi-address=$(ADDRESS)"
47-
- "--connection-timeout=15s"
48-
env:
49-
- name: ADDRESS
50-
value: /csi/csi.sock
45+
- -v=5
46+
- --csi-address=/csi/csi.sock
47+
- --connection-timeout=15s
5148
volumeMounts:
5249
- mountPath: /csi
5350
name: socket-dir

deploy/hostpath/csi-hostpath-snapshotter.yaml renamed to deploy/kubernetes-1.13/hostpath/csi-hostpath-snapshotter.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,9 @@ spec:
4242
- name: csi-snapshotter
4343
image: quay.io/k8scsi/csi-snapshotter:v1.0.1
4444
args:
45-
- "--csi-address=$(ADDRESS)"
46-
- "--connection-timeout=15s"
47-
env:
48-
- name: ADDRESS
49-
value: /csi/csi.sock
50-
imagePullPolicy: Always
45+
- -v=5
46+
- --csi-address=/csi/csi.sock
47+
- --connection-timeout=15s
5148
volumeMounts:
5249
- mountPath: /csi
5350
name: socket-dir

deploy/kubernetes-latest

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
kubernetes-1.13

0 commit comments

Comments
 (0)