From 3a40f792150622f881b0e52a9800d356e6e8b831 Mon Sep 17 00:00:00 2001 From: Blaine Gardner Date: Thu, 14 Mar 2024 11:15:38 -0600 Subject: [PATCH] disable holder pods in greenfield clusters When deploying new StorageClusters, ocs-operator should apply the new Rook operator config `CSI_REMOVE_HOLDER_PODS: "true"`. This reflects the new config and default value that Rook specifies in example manifests here: https://github.com/rook/rook/pull/13890 Signed-off-by: Blaine Gardner --- controllers/ocsinitialization/ocsinitialization_controller.go | 1 + controllers/util/k8sutil.go | 1 + 2 files changed, 2 insertions(+) diff --git a/controllers/ocsinitialization/ocsinitialization_controller.go b/controllers/ocsinitialization/ocsinitialization_controller.go index e969995f5a..0763a69163 100644 --- a/controllers/ocsinitialization/ocsinitialization_controller.go +++ b/controllers/ocsinitialization/ocsinitialization_controller.go @@ -273,6 +273,7 @@ func (r *OCSInitializationReconciler) ensureOcsOperatorConfigExists(initialData util.EnableTopologyKey: r.getEnableTopologyKeyValue(), util.TopologyDomainLabelsKey: r.getTopologyDomainLabelsKeyValue(), util.EnableNFSKey: r.getEnableNFSKeyValue(), + util.DisableHolderKey: "true", // disable holder pods for all greenfield clusters } ocsOperatorConfig := &corev1.ConfigMap{ diff --git a/controllers/util/k8sutil.go b/controllers/util/k8sutil.go index 065c1ec429..5746aa8003 100644 --- a/controllers/util/k8sutil.go +++ b/controllers/util/k8sutil.go @@ -37,6 +37,7 @@ const ( EnableTopologyKey = "CSI_ENABLE_TOPOLOGY" TopologyDomainLabelsKey = "CSI_TOPOLOGY_DOMAIN_LABELS" EnableNFSKey = "ROOK_CSI_ENABLE_NFS" + DisableHolderKey = "CSI_REMOVE_HOLDER_PODS" ) // GetWatchNamespace returns the namespace the operator should be watching for changes