From 1619e8eb953042facabc448bf6cbc67eeb46d5cc Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Wed, 2 Jun 2021 14:27:29 +0200 Subject: [PATCH] Clean apply's prune and kube addons with batch/v1 CronJob --- cluster/addons/addon-manager/kube-addons.sh | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/addons/addon-manager/kube-addons.sh b/cluster/addons/addon-manager/kube-addons.sh index ba2881c3ce6..6c0b0b8d06c 100755 --- a/cluster/addons/addon-manager/kube-addons.sh +++ b/cluster/addons/addon-manager/kube-addons.sh @@ -46,7 +46,7 @@ if [ -z "${KUBECTL_PRUNE_WHITELIST_OVERRIDE:-}" ]; then core/v1/Secret core/v1/Service batch/v1/Job - batch/v1beta1/CronJob + batch/v1/CronJob apps/v1/DaemonSet apps/v1/Deployment apps/v1/ReplicaSet diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go index d5049707857..1b65a3eb9cb 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go @@ -184,7 +184,7 @@ func getRESTMappings(mapper meta.RESTMapper, pruneResources *[]pruneResource) (n {"", "v1", "Secret", true}, {"", "v1", "Service", true}, {"batch", "v1", "Job", true}, - {"batch", "v1beta1", "CronJob", true}, + {"batch", "v1", "CronJob", true}, {"networking.k8s.io", "v1", "Ingress", true}, {"apps", "v1", "DaemonSet", true}, {"apps", "v1", "Deployment", true},