From ac295a57a5d6bc9dbc7e7260291cbf7a68d19104 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 20 Sep 2019 17:03:34 +0530 Subject: [PATCH 1/2] Remove containerized flag from provisioner containerized is only useful in nodeplugin not the provisioner pod Signed-off-by: Madhu Rajanna --- .../ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml | 1 - .../ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml index a49d86f7f..5188d9546 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml @@ -79,7 +79,6 @@ spec: - "--type=rbd" - "--controllerserver=true" - "--drivername={{ .DriverNamePrefix }}rbd.csi.ceph.com" - - "--containerized=true" - "--pidlimit=-1" - "--metricsport=9090" - "--metricspath=/metrics" diff --git a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml index be3b2c4e0..f369fec8d 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml @@ -72,7 +72,6 @@ spec: - "--type=rbd" - "--controllerserver=true" - "--drivername={{ .DriverNamePrefix }}rbd.csi.ceph.com" - - "--containerized=true" - "--pidlimit=-1" - "--metricsport=9090" - "--metricspath=/metrics" From 915bed0c3caba45833fc72157509cac9f278ba62 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 20 Sep 2019 17:06:09 +0530 Subject: [PATCH 2/2] remove `/` host mount from pod template set containerized flag as false This is not required as we are setting containerized=false and we have deprecated this flag in ceph-csi. Signed-off-by: Madhu Rajanna --- .../csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml | 7 ------- .../csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml | 7 ------- .../kubernetes/ceph/csi/template/rbd/csi-rbdplugin.yaml | 9 +-------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml index 5188d9546..628c76023 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml @@ -88,8 +88,6 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - - name: HOST_ROOTFS - value: "/rootfs" - name: NODE_ID valueFrom: fieldRef: @@ -106,8 +104,6 @@ spec: mountPath: /csi - mountPath: /dev name: host-dev - - mountPath: /rootfs - name: host-rootfs - mountPath: /sys name: host-sys - mountPath: /lib/modules @@ -141,9 +137,6 @@ spec: - name: host-dev hostPath: path: /dev - - name: host-rootfs - hostPath: - path: / - name: host-sys hostPath: path: /sys diff --git a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml index f369fec8d..8e092dd3c 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml @@ -81,8 +81,6 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - - name: HOST_ROOTFS - value: "/rootfs" - name: NODE_ID valueFrom: fieldRef: @@ -99,8 +97,6 @@ spec: mountPath: /csi - mountPath: /dev name: host-dev - - mountPath: /rootfs - name: host-rootfs - mountPath: /sys name: host-sys - mountPath: /lib/modules @@ -134,9 +130,6 @@ spec: - name: host-dev hostPath: path: /dev - - name: host-rootfs - hostPath: - path: / - name: host-sys hostPath: path: /sys diff --git a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin.yaml b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin.yaml index 42f6554fb..00aa57992 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin.yaml @@ -54,7 +54,7 @@ spec: - "--type=rbd" - "--nodeserver=true" - "--drivername={{ .DriverNamePrefix }}rbd.csi.ceph.com" - - "--containerized=true" + - "--containerized=false" - "--pidlimit=-1" - "--metricsport=9090" - "--metricspath=/metrics" @@ -64,8 +64,6 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - - name: HOST_ROOTFS - value: "/rootfs" - name: NODE_ID valueFrom: fieldRef: @@ -88,8 +86,6 @@ spec: mountPropagation: "Bidirectional" - mountPath: /dev name: host-dev - - mountPath: /rootfs - name: host-rootfs - mountPath: /sys name: host-sys - mountPath: /lib/modules @@ -139,9 +135,6 @@ spec: - name: host-dev hostPath: path: /dev - - name: host-rootfs - hostPath: - path: / - name: host-sys hostPath: path: /sys