forked from rook/rook
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 <madhupr007@gmail.com>
This commit is contained in:
@@ -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 :
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user