ceph: remove CSI_ENABLE_SNAPSHOTTER from CSI config
removed CSI_ENABLE_SNAPSHOTTER from the configuration to enable or disable csi-snapshotter as snapshot is moved to beta and enabled by default in kubernetes 1.17+ Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
1 parent
02c9bfe00f
commit
3f46b437c6
6 files changed
+3
-20
No files matched your search
@@ -135,7 +135,6 @@ The following tables lists the configurable parameters of the rook-operator char
|
||||
| `csi.cephfsLivenessMetricsPort` | CSI CephFS driver metrics port. | `9081` |
|
||||
| `csi.rbdGrpcMetricsPort` | Ceph CSI RBD driver GRPC metrics port. | `9090` |
|
||||
| `csi.rbdLivenessMetricsPort` | Ceph CSI RBD driver metrics port. | `8080` |
|
||||
| `csi.enableSnapshotter` | Enable deployment of snapshotter container in ceph-csi provisioner. | `true` |
|
||||
| `csi.forceCephFSKernelClient` | Enable Ceph Kernel clients on kernel < 4.17 which support quotas for Cephfs. | `true` |
|
||||
| `csi.kubeletDirPath` | Kubelet root directory path (if the Kubelet uses a different path for the `--root-dir` flag) | `/var/lib/kubelet` |
|
||||
| `csi.cephcsi.image` | Ceph CSI image. | `quay.io/cephcsi/cephcsi:v2.1.2` |
|
||||
|
||||
@@ -106,8 +106,6 @@ spec:
|
||||
value: {{ .Values.csi.enableRbdDriver | quote }}
|
||||
- name: ROOK_CSI_ENABLE_CEPHFS
|
||||
value: {{ .Values.csi.enableCephfsDriver | quote }}
|
||||
- name: CSI_ENABLE_SNAPSHOTTER
|
||||
value: {{ .Values.csi.enableSnapshotter | quote }}
|
||||
- name: CSI_PLUGIN_PRIORITY_CLASSNAME
|
||||
value: {{ .Values.csi.pluginPriorityClassName | quote }}
|
||||
- name: CSI_PROVISIONER_PRIORITY_CLASSNAME
|
||||
|
||||
@@ -57,7 +57,6 @@ csi:
|
||||
enableRbdDriver: true
|
||||
enableCephfsDriver: true
|
||||
enableGrpcMetrics: true
|
||||
enableSnapshotter: true
|
||||
# (Optional) set user created priorityclassName for csi plugin pods.
|
||||
# pluginPriorityClassName: system-node-critical
|
||||
|
||||
|
||||
@@ -105,8 +105,6 @@ data:
|
||||
# Enable the default version of the CSI RBD driver. To start another version of the CSI driver, see image properties below.
|
||||
ROOK_CSI_ENABLE_RBD: "true"
|
||||
ROOK_CSI_ENABLE_GRPC_METRICS: "true"
|
||||
# Enable deployment of csi-snapshotter sidecar container in ceph-csi provisioner pod.
|
||||
CSI_ENABLE_SNAPSHOTTER: "true"
|
||||
|
||||
# Set logging level for csi containers.
|
||||
# Supported values from 0 to 5. 0 for general useful logs, 5 for trace level verbosity.
|
||||
|
||||
@@ -29,8 +29,6 @@ data:
|
||||
# Enable the default version of the CSI RBD driver. To start another version of the CSI driver, see image properties below.
|
||||
ROOK_CSI_ENABLE_RBD: "true"
|
||||
ROOK_CSI_ENABLE_GRPC_METRICS: "true"
|
||||
# Enable deployment of csi-snapshotter sidecar container in ceph-csi provisioner pod.
|
||||
CSI_ENABLE_SNAPSHOTTER: "true"
|
||||
|
||||
# Set logging level for csi containers.
|
||||
# Supported values from 0 to 5. 0 for general useful logs, 5 for trace level verbosity.
|
||||
|
||||
@@ -251,18 +251,9 @@ func startDrivers(namespace string, clientset kubernetes.Interface, ver *version
|
||||
return errors.Wrap(err, "error getting CSI RBD liveness metrics port.")
|
||||
}
|
||||
|
||||
enableSnap, err := k8sutil.GetOperatorSetting(clientset, controllerutil.OperatorSettingConfigMapName, "CSI_ENABLE_SNAPSHOTTER", "true")
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "failed to load CSI_ENABLE_SNAPSHOTTER setting")
|
||||
}
|
||||
|
||||
if !strings.EqualFold(enableSnap, "false") {
|
||||
// disable snapshotter sidecar deployment if kubernetes version is less than 1.17
|
||||
if ver.Major > KubeMinMajor || (ver.Major == KubeMinMajor && ver.Minor < snapshotDeploymentSuppVersion) {
|
||||
tp.EnableSnapshotter = ""
|
||||
} else {
|
||||
tp.EnableSnapshotter = "true"
|
||||
}
|
||||
// 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
|
||||
|
||||
Reference in new issue
Block a user