diff --git a/deploy/kubernetes-1.14/README.md b/deploy/kubernetes-1.14/README.md deleted file mode 100644 index 40face28b..000000000 --- a/deploy/kubernetes-1.14/README.md +++ /dev/null @@ -1,8 +0,0 @@ -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. diff --git a/deploy/kubernetes-1.14/canary-blacklist.txt b/deploy/kubernetes-1.14/canary-blacklist.txt deleted file mode 100644 index 8734c2800..000000000 --- a/deploy/kubernetes-1.14/canary-blacklist.txt +++ /dev/null @@ -1,4 +0,0 @@ -# The following canary images are known to be incompatible with this -# deployment: -csi-attacher -csi-snapshotter diff --git a/deploy/kubernetes-1.14/deploy-hostpath.sh b/deploy/kubernetes-1.14/deploy-hostpath.sh deleted file mode 120000 index 589c43f62..000000000 --- a/deploy/kubernetes-1.14/deploy-hostpath.sh +++ /dev/null @@ -1 +0,0 @@ -../util/deploy-hostpath.sh \ No newline at end of file diff --git a/deploy/kubernetes-1.14/hostpath/csi-hostpath-attacher.yaml b/deploy/kubernetes-1.14/hostpath/csi-hostpath-attacher.yaml deleted file mode 100644 index ddaa37659..000000000 --- a/deploy/kubernetes-1.14/hostpath/csi-hostpath-attacher.yaml +++ /dev/null @@ -1,55 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: csi-hostpath-attacher - labels: - app: csi-hostpath-attacher -spec: - selector: - app: csi-hostpath-attacher - ports: - - name: dummy - port: 12345 - ---- -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: csi-hostpath-attacher -spec: - serviceName: "csi-hostpath-attacher" - replicas: 1 - selector: - matchLabels: - app: csi-hostpath-attacher - template: - metadata: - labels: - app: csi-hostpath-attacher - spec: - affinity: - podAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - csi-hostpathplugin - topologyKey: kubernetes.io/hostname - serviceAccountName: csi-attacher - containers: - - name: csi-attacher - image: quay.io/k8scsi/csi-attacher:v1.1.1 - args: - - --v=5 - - --csi-address=/csi/csi.sock - volumeMounts: - - mountPath: /csi - name: socket-dir - - volumes: - - hostPath: - path: /var/lib/kubelet/plugins/csi-hostpath - type: DirectoryOrCreate - name: socket-dir diff --git a/deploy/kubernetes-1.14/hostpath/csi-hostpath-plugin.yaml b/deploy/kubernetes-1.14/hostpath/csi-hostpath-plugin.yaml deleted file mode 100644 index 2d54b74e8..000000000 --- a/deploy/kubernetes-1.14/hostpath/csi-hostpath-plugin.yaml +++ /dev/null @@ -1,143 +0,0 @@ -# Service defined here, plus serviceName below in StatefulSet, -# are needed only because of condition explained in -# https://github.com/kubernetes/kubernetes/issues/69608 - -kind: Service -apiVersion: v1 -metadata: - name: csi-hostpathplugin - labels: - app: csi-hostpathplugin -spec: - selector: - app: csi-hostpathplugin - ports: - - name: dummy - port: 12345 ---- -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: csi-hostpathplugin -spec: - serviceName: "csi-hostpathplugin" - # One replica only: - # Host path driver only works when everything runs - # on a single node. We achieve that by starting it once and then - # co-locate all other pods via inter-pod affinity - replicas: 1 - selector: - matchLabels: - app: csi-hostpathplugin - template: - metadata: - labels: - app: csi-hostpathplugin - spec: - hostNetwork: true - containers: - - name: node-driver-registrar - image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0 - lifecycle: - preStop: - exec: - command: ["/bin/sh", "-c", "rm -rf /registration/csi-hostpath /registration/csi-hostpath-reg.sock"] - args: - - --v=5 - - --csi-address=/csi/csi.sock - - --kubelet-registration-path=/var/lib/kubelet/plugins/csi-hostpath/csi.sock - securityContext: - privileged: true - env: - - name: KUBE_NODE_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: spec.nodeName - volumeMounts: - - mountPath: /csi - name: socket-dir - - mountPath: /registration - name: registration-dir - - mountPath: /csi-data-dir - name: csi-data-dir - - - name: hostpath - image: quay.io/k8scsi/hostpathplugin:v1.2.0 - args: - - "--drivername=hostpath.csi.k8s.io" - - "--v=5" - - "--endpoint=$(CSI_ENDPOINT)" - - "--nodeid=$(KUBE_NODE_NAME)" - env: - - name: CSI_ENDPOINT - value: unix:///csi/csi.sock - - name: KUBE_NODE_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: spec.nodeName - securityContext: - privileged: true - ports: - - containerPort: 9898 - name: healthz - protocol: TCP - livenessProbe: - failureThreshold: 5 - httpGet: - path: /healthz - port: healthz - initialDelaySeconds: 10 - timeoutSeconds: 3 - periodSeconds: 2 - volumeMounts: - - mountPath: /csi - name: socket-dir - - mountPath: /var/lib/kubelet/pods - mountPropagation: Bidirectional - name: mountpoint-dir - - mountPath: /var/lib/kubelet/plugins - mountPropagation: Bidirectional - name: plugins-dir - - mountPath: /csi-data-dir - name: csi-data-dir - - mountPath: /dev - name: dev-dir - - name: liveness-probe - volumeMounts: - - mountPath: /csi - name: socket-dir - image: quay.io/k8scsi/livenessprobe:v1.1.0 - args: - - --csi-address=/csi/csi.sock - - --connection-timeout=3s - - --health-port=9898 - - volumes: - - hostPath: - path: /var/lib/kubelet/plugins/csi-hostpath - type: DirectoryOrCreate - name: socket-dir - - hostPath: - path: /var/lib/kubelet/pods - type: DirectoryOrCreate - name: mountpoint-dir - - hostPath: - path: /var/lib/kubelet/plugins_registry - type: Directory - name: registration-dir - - hostPath: - path: /var/lib/kubelet/plugins - type: Directory - name: plugins-dir - - hostPath: - # 'path' is where PV data is persisted on host. - # using /tmp is also possible while the PVs will not available after plugin container recreation or host reboot - path: /var/lib/csi-hostpath-data/ - type: DirectoryOrCreate - name: csi-data-dir - - hostPath: - path: /dev - type: Directory - name: dev-dir diff --git a/deploy/kubernetes-1.14/hostpath/csi-hostpath-provisioner.yaml b/deploy/kubernetes-1.14/hostpath/csi-hostpath-provisioner.yaml deleted file mode 100644 index 662ba8741..000000000 --- a/deploy/kubernetes-1.14/hostpath/csi-hostpath-provisioner.yaml +++ /dev/null @@ -1,56 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: csi-hostpath-provisioner - labels: - app: csi-hostpath-provisioner -spec: - selector: - app: csi-hostpath-provisioner - ports: - - name: dummy - port: 12345 - ---- -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: csi-hostpath-provisioner -spec: - serviceName: "csi-hostpath-provisioner" - replicas: 1 - selector: - matchLabels: - app: csi-hostpath-provisioner - template: - metadata: - labels: - app: csi-hostpath-provisioner - spec: - affinity: - podAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - csi-hostpathplugin - topologyKey: kubernetes.io/hostname - serviceAccountName: csi-provisioner - containers: - - name: csi-provisioner - image: quay.io/k8scsi/csi-provisioner:v1.2.2 - args: - - -v=5 - - --csi-address=/csi/csi.sock - - --connection-timeout=15s - - --feature-gates=Topology=true - volumeMounts: - - mountPath: /csi - name: socket-dir - volumes: - - hostPath: - path: /var/lib/kubelet/plugins/csi-hostpath - type: DirectoryOrCreate - name: socket-dir diff --git a/deploy/kubernetes-1.14/hostpath/csi-hostpath-resizer.yaml b/deploy/kubernetes-1.14/hostpath/csi-hostpath-resizer.yaml deleted file mode 100644 index a1b87f716..000000000 --- a/deploy/kubernetes-1.14/hostpath/csi-hostpath-resizer.yaml +++ /dev/null @@ -1,54 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: csi-hostpath-resizer - labels: - app: csi-hostpath-resizer -spec: - selector: - app: csi-hostpath-resizer - ports: - - name: dummy - port: 12345 - ---- -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: csi-hostpath-resizer -spec: - serviceName: "csi-hostpath-resizer" - replicas: 1 - selector: - matchLabels: - app: csi-hostpath-resizer - template: - metadata: - labels: - app: csi-hostpath-resizer - spec: - affinity: - podAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - csi-hostpathplugin - topologyKey: kubernetes.io/hostname - serviceAccountName: csi-resizer - containers: - - name: csi-resizer - image: quay.io/k8scsi/csi-resizer:v0.2.0 - args: - - -v=5 - - -csi-address=/csi/csi.sock - volumeMounts: - - mountPath: /csi - name: socket-dir - volumes: - - hostPath: - path: /var/lib/kubelet/plugins/csi-hostpath - type: DirectoryOrCreate - name: socket-dir diff --git a/deploy/kubernetes-1.14/hostpath/csi-hostpath-snapshotter.yaml b/deploy/kubernetes-1.14/hostpath/csi-hostpath-snapshotter.yaml deleted file mode 100644 index 515452729..000000000 --- a/deploy/kubernetes-1.14/hostpath/csi-hostpath-snapshotter.yaml +++ /dev/null @@ -1,55 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: csi-hostpath-snapshotter - labels: - app: csi-hostpath-snapshotter -spec: - selector: - app: csi-hostpath-snapshotter - ports: - - name: dummy - port: 12345 - ---- -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: csi-hostpath-snapshotter -spec: - serviceName: "csi-hostpath-snapshotter" - replicas: 1 - selector: - matchLabels: - app: csi-hostpath-snapshotter - template: - metadata: - labels: - app: csi-hostpath-snapshotter - spec: - affinity: - podAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - csi-hostpathplugin - topologyKey: kubernetes.io/hostname - serviceAccount: csi-snapshotter - containers: - - name: csi-snapshotter - image: quay.io/k8scsi/csi-snapshotter:v1.2.2 - args: - - -v=5 - - --csi-address=/csi/csi.sock - - --connection-timeout=15s - volumeMounts: - - mountPath: /csi - name: socket-dir - volumes: - - hostPath: - path: /var/lib/kubelet/plugins/csi-hostpath - type: DirectoryOrCreate - name: socket-dir diff --git a/deploy/kubernetes-1.14/hostpath/csi-hostpath-testing.yaml b/deploy/kubernetes-1.14/hostpath/csi-hostpath-testing.yaml deleted file mode 100644 index 3e6b837d1..000000000 --- a/deploy/kubernetes-1.14/hostpath/csi-hostpath-testing.yaml +++ /dev/null @@ -1,59 +0,0 @@ -# WARNING: this is only for testing purposes. Do not install in a production -# cluster. -# -# This exposes the hostpath's Unix domain csi.sock as a TCP port to the -# outside world. The mapping from Unix domain socket to TCP is done -# by socat. -# -# This is useful for testing with csi-sanity or csc. - -apiVersion: v1 -kind: Service -metadata: - name: hostpath-service -spec: - type: NodePort - selector: - app: csi-hostpath-socat - ports: - - port: 10000 # fixed port inside the pod, dynamically allocated port outside ---- -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: csi-hostpath-socat -spec: - serviceName: "csi-hostpath-socat" - replicas: 1 - selector: - matchLabels: - app: csi-hostpath-socat - template: - metadata: - labels: - app: csi-hostpath-socat - spec: - affinity: - podAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - csi-hostpathplugin - topologyKey: kubernetes.io/hostname - containers: - - name: socat - image: alpine/socat:1.0.3 - args: - - tcp-listen:10000,fork,reuseaddr - - unix-connect:/csi/csi.sock - volumeMounts: - - mountPath: /csi - name: socket-dir - volumes: - - hostPath: - path: /var/lib/kubelet/plugins/csi-hostpath - type: DirectoryOrCreate - name: socket-dir diff --git a/deploy/kubernetes-1.14/snapshotter/csi-hostpath-snapshotclass.yaml b/deploy/kubernetes-1.14/snapshotter/csi-hostpath-snapshotclass.yaml deleted file mode 100644 index e222c1783..000000000 --- a/deploy/kubernetes-1.14/snapshotter/csi-hostpath-snapshotclass.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: snapshot.storage.k8s.io/v1alpha1 -kind: VolumeSnapshotClass -metadata: - name: csi-hostpath-snapclass -snapshotter: hostpath.csi.k8s.io diff --git a/deploy/kubernetes-1.15/hostpath/csi-hostpath-plugin.yaml b/deploy/kubernetes-1.15/hostpath/csi-hostpath-plugin.yaml index 2d54b74e8..13ae43690 100644 --- a/deploy/kubernetes-1.15/hostpath/csi-hostpath-plugin.yaml +++ b/deploy/kubernetes-1.15/hostpath/csi-hostpath-plugin.yaml @@ -111,7 +111,6 @@ spec: image: quay.io/k8scsi/livenessprobe:v1.1.0 args: - --csi-address=/csi/csi.sock - - --connection-timeout=3s - --health-port=9898 volumes: diff --git a/deploy/kubernetes-1.15/hostpath/csi-hostpath-provisioner.yaml b/deploy/kubernetes-1.15/hostpath/csi-hostpath-provisioner.yaml index e51c12d50..d56afa7f1 100644 --- a/deploy/kubernetes-1.15/hostpath/csi-hostpath-provisioner.yaml +++ b/deploy/kubernetes-1.15/hostpath/csi-hostpath-provisioner.yaml @@ -44,7 +44,6 @@ spec: args: - -v=5 - --csi-address=/csi/csi.sock - - --connection-timeout=15s - --feature-gates=Topology=true volumeMounts: - mountPath: /csi diff --git a/deploy/kubernetes-1.15/hostpath/csi-hostpath-snapshotter.yaml b/deploy/kubernetes-1.15/hostpath/csi-hostpath-snapshotter.yaml index 515452729..eec75fa98 100644 --- a/deploy/kubernetes-1.15/hostpath/csi-hostpath-snapshotter.yaml +++ b/deploy/kubernetes-1.15/hostpath/csi-hostpath-snapshotter.yaml @@ -44,7 +44,6 @@ spec: args: - -v=5 - --csi-address=/csi/csi.sock - - --connection-timeout=15s volumeMounts: - mountPath: /csi name: socket-dir diff --git a/deploy/kubernetes-1.16/hostpath/csi-hostpath-plugin.yaml b/deploy/kubernetes-1.16/hostpath/csi-hostpath-plugin.yaml index 018de9f93..ac0b28ae2 100644 --- a/deploy/kubernetes-1.16/hostpath/csi-hostpath-plugin.yaml +++ b/deploy/kubernetes-1.16/hostpath/csi-hostpath-plugin.yaml @@ -118,7 +118,6 @@ spec: image: quay.io/k8scsi/livenessprobe:v1.1.0 args: - --csi-address=/csi/csi.sock - - --connection-timeout=3s - --health-port=9898 volumes: diff --git a/deploy/kubernetes-1.16/hostpath/csi-hostpath-provisioner.yaml b/deploy/kubernetes-1.16/hostpath/csi-hostpath-provisioner.yaml index 20c91344c..2fe74e91e 100644 --- a/deploy/kubernetes-1.16/hostpath/csi-hostpath-provisioner.yaml +++ b/deploy/kubernetes-1.16/hostpath/csi-hostpath-provisioner.yaml @@ -44,7 +44,6 @@ spec: args: - -v=5 - --csi-address=/csi/csi.sock - - --connection-timeout=15s - --feature-gates=Topology=true securityContext: # This is necessary only for systems with SELinux, where diff --git a/deploy/kubernetes-1.16/hostpath/csi-hostpath-snapshotter.yaml b/deploy/kubernetes-1.16/hostpath/csi-hostpath-snapshotter.yaml index 54558852d..447888fcd 100644 --- a/deploy/kubernetes-1.16/hostpath/csi-hostpath-snapshotter.yaml +++ b/deploy/kubernetes-1.16/hostpath/csi-hostpath-snapshotter.yaml @@ -44,7 +44,6 @@ spec: args: - -v=5 - --csi-address=/csi/csi.sock - - --connection-timeout=15s securityContext: # This is necessary only for systems with SELinux, where # non-privileged sidecar containers cannot access unix domain socket diff --git a/deploy/kubernetes-1.17/hostpath/csi-hostpath-plugin.yaml b/deploy/kubernetes-1.17/hostpath/csi-hostpath-plugin.yaml index 52e06069d..317577086 100644 --- a/deploy/kubernetes-1.17/hostpath/csi-hostpath-plugin.yaml +++ b/deploy/kubernetes-1.17/hostpath/csi-hostpath-plugin.yaml @@ -113,7 +113,6 @@ spec: image: quay.io/k8scsi/livenessprobe:v1.1.0 args: - --csi-address=/csi/csi.sock - - --connection-timeout=3s - --health-port=9898 volumes: