From cc3b4e6906b12cea0b142be1fa4fbc848a2feab5 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Mon, 27 Jul 2020 13:45:56 +0530 Subject: [PATCH] ceph: remove check for kubernetes version as we are going to deploy snapshotter by default we are going to remove the kubernetes version check. Signed-off-by: Madhu Rajanna --- .../csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml | 2 -- pkg/operator/ceph/csi/spec.go | 6 ------ 2 files changed, 8 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 625838b45..43a709dcb 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 @@ -66,7 +66,6 @@ spec: volumeMounts: - name: socket-dir mountPath: /csi - {{ if .EnableSnapshotter }} - name: csi-snapshotter image: {{ .SnapshotterImage }} args: @@ -82,7 +81,6 @@ spec: volumeMounts: - name: socket-dir mountPath: /csi - {{ end }} - name: csi-rbdplugin image: {{ .CSIPluginImage }} args : diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 56d23d172..d6acc7759 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -46,7 +46,6 @@ type Param struct { SnapshotterImage string ResizerImage string DriverNamePrefix string - EnableSnapshotter string EnableCSIGRPCMetrics string KubeletDirPath string ForceCephFSKernelClient string @@ -259,11 +258,6 @@ func startDrivers(clientset kubernetes.Interface, namespace string, ver *version return errors.Wrap(err, "error getting CSI RBD liveness metrics port.") } - // Enable snapshotter sidecar deployment if kubernetes version is >= 1.17 - if ver.Major > KubeMinMajor || (ver.Major == KubeMinMajor && ver.Minor >= snapshotDeploymentSuppVersion) { - tp.EnableSnapshotter = "true" - } - // default value `system-node-critical` is the highest available priority tp.PluginPriorityClassName, err = k8sutil.GetOperatorSetting(clientset, controllerutil.OperatorSettingConfigMapName, "CSI_PLUGIN_PRIORITY_CLASSNAME", "") if err != nil {