diff --git a/deploy/charts/rook-ceph/templates/deployment.yaml b/deploy/charts/rook-ceph/templates/deployment.yaml index fa942c199..5b20d8284 100644 --- a/deploy/charts/rook-ceph/templates/deployment.yaml +++ b/deploy/charts/rook-ceph/templates/deployment.yaml @@ -77,8 +77,6 @@ spec: {{- end }} - name: ROOK_HOSTPATH_REQUIRES_PRIVILEGED value: "{{ .Values.hostpathRequiresPrivileged }}" - - name: ROOK_ENABLE_SELINUX_RELABELING - value: "{{ .Values.enableSelinuxRelabeling }}" - name: ROOK_DISABLE_DEVICE_HOTPLUG value: "{{ .Values.disableDeviceHotplug }}" - name: ROOK_ENABLE_DISCOVERY_DAEMON diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml index 810937f99..90d528da9 100644 --- a/deploy/charts/rook-ceph/values.yaml +++ b/deploy/charts/rook-ceph/values.yaml @@ -450,11 +450,6 @@ cephCommandsTimeoutSeconds: "15" # nodeAffinity: key1=value1,value2; key2=value3 # podLabels: "key1=value1,key2=value2" -# In some situations SELinux relabelling breaks (times out) on large filesystems, and doesn't work with cephfs ReadWriteMany volumes (last relabel wins). -# Disable it here if you have similar issues. -# For more details see https://github.com/rook/rook/issues/2417 -enableSelinuxRelabeling: true - disableAdmissionController: false # Writing to the hostPath is required for the Ceph mon and osd pods. Given the restricted permissions in OpenShift with SELinux, diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index 71bc872c4..ff5983edc 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -637,15 +637,6 @@ spec: # For more details see https://github.com/rook/rook/issues/1314#issuecomment-355799641 - name: ROOK_HOSTPATH_REQUIRES_PRIVILEGED value: "true" - # In some situations SELinux relabelling breaks (times out) on large filesystems, and doesn't work with cephfs ReadWriteMany volumes (last relabel wins). - # Disable it here if you have similar issues. - # For more details see https://github.com/rook/rook/issues/2417 - - name: ROOK_ENABLE_SELINUX_RELABELING - value: "true" - # In large volumes it will take some time to chown all the files. Disable it here if you have performance issues. - # For more details see https://github.com/rook/rook/issues/2254 - - name: ROOK_ENABLE_FSGROUP - value: "true" # Disable automatic orchestration when new devices are discovered - name: ROOK_DISABLE_DEVICE_HOTPLUG value: "false" diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index d2603e8e8..9dbfb4729 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -577,17 +577,6 @@ spec: - name: ROOK_HOSTPATH_REQUIRES_PRIVILEGED value: "false" - # In some situations SELinux relabelling breaks (times out) on large filesystems, and doesn't work with cephfs ReadWriteMany volumes (last relabel wins). - # Disable it here if you have similar issues. - # For more details see https://github.com/rook/rook/issues/2417 - - name: ROOK_ENABLE_SELINUX_RELABELING - value: "true" - - # In large volumes it will take some time to chown all the files. Disable it here if you have performance issues. - # For more details see https://github.com/rook/rook/issues/2254 - - name: ROOK_ENABLE_FSGROUP - value: "true" - # Disable automatic orchestration when new devices are discovered - name: ROOK_DISABLE_DEVICE_HOTPLUG value: "false"