From 19eb1120123e8a70868cdee17580be99ce54817c Mon Sep 17 00:00:00 2001 From: sp98 Date: Thu, 22 Aug 2024 19:27:26 +0530 Subject: [PATCH] core: fix reading flags in cleanup job cmd Cleanup job cli was not reading the flags correctly. As a result, dataDirHostPath was never cleaned up. Signed-off-by: sp98 (cherry picked from commit a44a22216ff4d0550f116a3a969a5c7e3a657681) --- cmd/rook/ceph/cleanup.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/rook/ceph/cleanup.go b/cmd/rook/ceph/cleanup.go index 5294a24cf60c..f158619d9b63 100644 --- a/cmd/rook/ceph/cleanup.go +++ b/cmd/rook/ceph/cleanup.go @@ -63,15 +63,15 @@ var cleanUpRadosNamespaceCmd = &cobra.Command{ } func init() { - cleanUpCmd.Flags().StringVar(&dataDirHostPath, "data-dir-host-path", "", "dataDirHostPath on the node") - cleanUpCmd.Flags().StringVar(&namespaceDir, "namespace-dir", "", "dataDirHostPath on the node") + cleanUpHostCmd.Flags().StringVar(&dataDirHostPath, "data-dir-host-path", "", "dataDirHostPath on the node") + cleanUpHostCmd.Flags().StringVar(&namespaceDir, "namespace-dir", "", "dataDirHostPath on the node") cleanUpHostCmd.Flags().StringVar(&monSecret, "mon-secret", "", "monitor secret from the keyring") cleanUpHostCmd.Flags().StringVar(&clusterFSID, "cluster-fsid", "", "ceph cluster fsid") cleanUpHostCmd.Flags().StringVar(&sanitizeMethod, "sanitize-method", string(cephv1.SanitizeMethodQuick), "sanitize method to use (metadata or data)") cleanUpHostCmd.Flags().StringVar(&sanitizeDataSource, "sanitize-data-source", string(cephv1.SanitizeDataSourceZero), "data source to sanitize the disk (zero or random)") cleanUpHostCmd.Flags().Int32Var(&sanitizeIteration, "sanitize-iteration", 1, "overwrite N times the disk") - flags.SetFlagsFromEnv(cleanUpHostCmd.Flags(), rook.RookEnvVarPrefix) + flags.SetFlagsFromEnv(cleanUpHostCmd.Flags(), rook.RookEnvVarPrefix) flags.SetFlagsFromEnv(cleanUpSubVolumeGroupCmd.Flags(), rook.RookEnvVarPrefix) cleanUpCmd.AddCommand(cleanUpHostCmd, cleanUpSubVolumeGroupCmd, cleanUpRadosNamespaceCmd) @@ -83,7 +83,7 @@ func init() { func startHostCleanUp(cmd *cobra.Command, args []string) error { rook.SetLogLevel() - rook.LogStartupInfo(cleanUpCmd.Flags()) + rook.LogStartupInfo(cleanUpHostCmd.Flags()) ctx := cmd.Context()