From 1dbdd9bb12917e5231acbc29c5e371b98fe5beab Mon Sep 17 00:00:00 2001 From: ShyamsundarR Date: Mon, 1 Jul 2019 13:30:23 -0400 Subject: [PATCH] Update Ceph-CSI manifests as per changes to ceph-csi repository Ceph-CSI repository had a recent PR [1] merged that contains changes to the pod manifests. This PR to Rook updates the pod manifests to catchup with the changes to Ceph-CSI master. Once Ceph-CSI has a 1.1.0 release, future PRs to Rook on manifest changes would track that branch (at least for Rook 1.1 release). [1] PR in ceph-csi changing the manifest: https://github.com/ceph/ceph-csi/pull/443 Signed-off-by: ShyamsundarR --- .../csi/template/cephfs/csi-cephfsplugin-provisioner.yaml | 2 ++ .../ceph/csi/template/rbd/csi-rbdplugin-provisioner.yaml | 4 +++- tests/framework/installer/ceph_csi_templates.go | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner.yaml b/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner.yaml index b2f7563a1..e18917129 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner.yaml @@ -33,6 +33,8 @@ spec: args: - "--csi-address=$(ADDRESS)" - "--v=5" + - "--timeout=60s" + - "--retry-interval-start=500ms" env: - name: ADDRESS value: unix:///csi/csi-provisioner.sock diff --git a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner.yaml b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner.yaml index 7768859b6..97b585c3d 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner.yaml @@ -21,6 +21,8 @@ spec: args: - "--csi-address=$(ADDRESS)" - "--v=5" + - "--timeout=60s" + - "--retry-interval-start=500ms" env: - name: ADDRESS value: unix:///csi/csi-provisioner.sock @@ -44,8 +46,8 @@ spec: image: {{ .SnapshotterImage }} args: - "--csi-address=$(ADDRESS)" - - "--connection-timeout=15s" - "--v=5" + - "--timeout=60s" env: - name: ADDRESS value: unix:///csi/csi-provisioner.sock diff --git a/tests/framework/installer/ceph_csi_templates.go b/tests/framework/installer/ceph_csi_templates.go index 1293d5ac3..2070b010e 100644 --- a/tests/framework/installer/ceph_csi_templates.go +++ b/tests/framework/installer/ceph_csi_templates.go @@ -41,6 +41,8 @@ const ( args: - "--csi-address=$(ADDRESS)" - "--v=5" + - "--timeout=60s" + - "--retry-interval-start=500ms" env: - name: ADDRESS value: unix:///csi/csi-provisioner.sock @@ -65,8 +67,8 @@ const ( image: {{ .SnapshotterImage }} args: - "--csi-address=$(ADDRESS)" - - "--connection-timeout=15s" - "--v=5" + - "--timeout=60s" env: - name: ADDRESS value: unix:///csi/csi-provisioner.sock @@ -285,6 +287,8 @@ const ( args: - "--csi-address=$(ADDRESS)" - "--v=5" + - "--timeout=60s" + - "--retry-interval-start=500ms" env: - name: ADDRESS value: unix:///csi/csi-provisioner.sock