From 7f0aa8954bbd77bec2d10af12db421d9deb15734 Mon Sep 17 00:00:00 2001
From: Abirdcfly <fp544037857@gmail.com>
Date: Tue, 5 Jul 2022 13:24:21 +0800
Subject: [PATCH] cleanup kubectl describe cronjob v1beta1

Signed-off-by: Abirdcfly <fp544037857@gmail.com>

Kubernetes-commit: a120e7380559e4e03f7bd65f011affeb45739f12
---
 pkg/describe/describe.go | 79 ++--------------------------------------
 1 file changed, 3 insertions(+), 76 deletions(-)

diff --git a/pkg/describe/describe.go b/pkg/describe/describe.go
index 34c94750..32141a7a 100644
--- a/pkg/describe/describe.go
+++ b/pkg/describe/describe.go
@@ -2325,22 +2325,14 @@ func (d *CronJobDescriber) Describe(namespace, name string, describerSettings De
 	var events *corev1.EventList
 
 	cronJob, err := d.client.BatchV1().CronJobs(namespace).Get(context.TODO(), name, metav1.GetOptions{})
-	if err == nil {
-		if describerSettings.ShowEvents {
-			events, _ = searchEvents(d.client.CoreV1(), cronJob, describerSettings.ChunkSize)
-		}
-		return describeCronJob(cronJob, events)
-	}
-
-	// TODO: drop this condition when beta disappears in 1.25
-	cronJobBeta, err := d.client.BatchV1beta1().CronJobs(namespace).Get(context.TODO(), name, metav1.GetOptions{})
 	if err != nil {
 		return "", err
 	}
+
 	if describerSettings.ShowEvents {
-		events, _ = searchEvents(d.client.CoreV1(), cronJobBeta, describerSettings.ChunkSize)
+		events, _ = searchEvents(d.client.CoreV1(), cronJob, describerSettings.ChunkSize)
 	}
-	return describeCronJobBeta(cronJobBeta, events)
+	return describeCronJob(cronJob, events)
 }
 
 func describeCronJob(cronJob *batchv1.CronJob, events *corev1.EventList) (string, error) {
@@ -2408,71 +2400,6 @@ func describeJobTemplate(jobTemplate batchv1.JobTemplateSpec, w PrefixWriter) {
 	DescribePodTemplate(&jobTemplate.Spec.Template, w)
 }
 
-func describeCronJobBeta(cronJob *batchv1beta1.CronJob, events *corev1.EventList) (string, error) {
-	return tabbedString(func(out io.Writer) error {
-		w := NewPrefixWriter(out)
-		w.Write(LEVEL_0, "Name:\t%s\n", cronJob.Name)
-		w.Write(LEVEL_0, "Namespace:\t%s\n", cronJob.Namespace)
-		printLabelsMultiline(w, "Labels", cronJob.Labels)
-		printAnnotationsMultiline(w, "Annotations", cronJob.Annotations)
-		w.Write(LEVEL_0, "Schedule:\t%s\n", cronJob.Spec.Schedule)
-		w.Write(LEVEL_0, "Concurrency Policy:\t%s\n", cronJob.Spec.ConcurrencyPolicy)
-		w.Write(LEVEL_0, "Suspend:\t%s\n", printBoolPtr(cronJob.Spec.Suspend))
-		if cronJob.Spec.SuccessfulJobsHistoryLimit != nil {
-			w.Write(LEVEL_0, "Successful Job History Limit:\t%d\n", *cronJob.Spec.SuccessfulJobsHistoryLimit)
-		} else {
-			w.Write(LEVEL_0, "Successful Job History Limit:\t<unset>\n")
-		}
-		if cronJob.Spec.FailedJobsHistoryLimit != nil {
-			w.Write(LEVEL_0, "Failed Job History Limit:\t%d\n", *cronJob.Spec.FailedJobsHistoryLimit)
-		} else {
-			w.Write(LEVEL_0, "Failed Job History Limit:\t<unset>\n")
-		}
-		if cronJob.Spec.StartingDeadlineSeconds != nil {
-			w.Write(LEVEL_0, "Starting Deadline Seconds:\t%ds\n", *cronJob.Spec.StartingDeadlineSeconds)
-		} else {
-			w.Write(LEVEL_0, "Starting Deadline Seconds:\t<unset>\n")
-		}
-		describeJobTemplateBeta(cronJob.Spec.JobTemplate, w)
-		if cronJob.Status.LastScheduleTime != nil {
-			w.Write(LEVEL_0, "Last Schedule Time:\t%s\n", cronJob.Status.LastScheduleTime.Time.Format(time.RFC1123Z))
-		} else {
-			w.Write(LEVEL_0, "Last Schedule Time:\t<unset>\n")
-		}
-		printActiveJobs(w, "Active Jobs", cronJob.Status.Active)
-		if events != nil {
-			DescribeEvents(events, w)
-		}
-		return nil
-	})
-}
-
-func describeJobTemplateBeta(jobTemplate batchv1beta1.JobTemplateSpec, w PrefixWriter) {
-	if jobTemplate.Spec.Selector != nil {
-		if selector, err := metav1.LabelSelectorAsSelector(jobTemplate.Spec.Selector); err == nil {
-			w.Write(LEVEL_0, "Selector:\t%s\n", selector)
-		} else {
-			w.Write(LEVEL_0, "Selector:\tFailed to get selector: %s\n", err)
-		}
-	} else {
-		w.Write(LEVEL_0, "Selector:\t<unset>\n")
-	}
-	if jobTemplate.Spec.Parallelism != nil {
-		w.Write(LEVEL_0, "Parallelism:\t%d\n", *jobTemplate.Spec.Parallelism)
-	} else {
-		w.Write(LEVEL_0, "Parallelism:\t<unset>\n")
-	}
-	if jobTemplate.Spec.Completions != nil {
-		w.Write(LEVEL_0, "Completions:\t%d\n", *jobTemplate.Spec.Completions)
-	} else {
-		w.Write(LEVEL_0, "Completions:\t<unset>\n")
-	}
-	if jobTemplate.Spec.ActiveDeadlineSeconds != nil {
-		w.Write(LEVEL_0, "Active Deadline Seconds:\t%ds\n", *jobTemplate.Spec.ActiveDeadlineSeconds)
-	}
-	DescribePodTemplate(&jobTemplate.Spec.Template, w)
-}
-
 func printActiveJobs(w PrefixWriter, title string, jobs []corev1.ObjectReference) {
 	w.Write(LEVEL_0, "%s:\t", title)
 	if len(jobs) == 0 {