Merge pull request #2042 from ardaguclu/revert-2028-ocpbugs-56691

OCPBUGS-57635: Revert "OCPBUGS-56691: Rely on overall available disk space of the mounted volume"

Author: openshift-merge-bot[bot]

pkg/cli/admin/mustgather/mustgather.go

@@ -84,7 +84,9 @@ var (
 	volumeUsageCheckerScript = `
 echo "volume percentage checker started....."
 while true; do
-usage_percentage=$(df -P "%s" | awk 'NR==2 {print $5}' | sed 's/%%//')
+disk_usage=$(du -s "%s" | awk '{print $1}')
+disk_space=$(df -P "%s" | awk 'NR==2 {print $2}')
+usage_percentage=$(( (disk_usage * 100) / disk_space ))
 echo "volume usage percentage $usage_percentage"
 if [ "$usage_percentage" -gt "%d" ]; then
 	echo "Disk usage exceeds the volume percentage of %d for mounted directory. Exiting..."
@@ -141,7 +143,7 @@ func NewMustGatherOptions(streams genericiooptions.IOStreams) *MustGatherOptions
 		SourceDir:        "/must-gather/",
 		IOStreams:        streams,
 		Timeout:          10 * time.Minute,
-		VolumePercentage: 50,
+		VolumePercentage: 30,
 	}
 	opts.LogOut = opts.newPrefixWriter(streams.Out, "[must-gather      ] OUT", false, true)
 	opts.RawOut = opts.newPrefixWriter(streams.Out, "", false, false)
@@ -467,7 +469,7 @@ func (o *MustGatherOptions) Run() error {
 	}
 	var hasMaster bool
 	for _, node := range nodes.Items {
-		if _, ok := node.Labels["node-role.kubernetes.io/control-plane"]; ok {
+		if _, ok := node.Labels["node-role.kubernetes.io/master"]; ok {
 			hasMaster = true
 			break
 		}
@@ -929,7 +931,7 @@ func (o *MustGatherOptions) newPod(node, image string, hasMaster bool) *corev1.P
 		corev1.LabelOSStable: "linux",
 	}
 	if node == "" && hasMaster {
-		nodeSelector["node-role.kubernetes.io/control-plane"] = ""
+		nodeSelector["node-role.kubernetes.io/master"] = ""
 	}
 
 	executedCommand := "/usr/bin/gather"
@@ -938,7 +940,7 @@ func (o *MustGatherOptions) newPod(node, image string, hasMaster bool) *corev1.P
 	}
 
 	cleanedSourceDir := path.Clean(o.SourceDir)
-	volumeUsageChecker := fmt.Sprintf(volumeUsageCheckerScript, cleanedSourceDir, o.VolumePercentage, o.VolumePercentage, executedCommand)
+	volumeUsageChecker := fmt.Sprintf(volumeUsageCheckerScript, cleanedSourceDir, cleanedSourceDir, o.VolumePercentage, o.VolumePercentage, executedCommand)
 
 	ret := &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{