From 25f3cf55509acdd3bd31bc9ca028c5d5a3bd22b0 Mon Sep 17 00:00:00 2001 From: Ricardo Pchevuzinske Katz Date: Fri, 5 Feb 2021 09:38:28 -0300 Subject: [PATCH] Remove extensions v1beta1 from addon manager and kubectl prune --- cluster/addons/addon-manager/kube-addons.sh | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cluster/addons/addon-manager/kube-addons.sh b/cluster/addons/addon-manager/kube-addons.sh index b09575ad65f..b16f2f5ba42 100755 --- a/cluster/addons/addon-manager/kube-addons.sh +++ b/cluster/addons/addon-manager/kube-addons.sh @@ -51,7 +51,7 @@ if [ -z "${KUBECTL_PRUNE_WHITELIST_OVERRIDE:-}" ]; then apps/v1/Deployment apps/v1/ReplicaSet apps/v1/StatefulSet - extensions/v1beta1/Ingress + networking.k8s.io/v1/Ingress ) else read -ra KUBECTL_PRUNE_WHITELIST <<< "${KUBECTL_PRUNE_WHITELIST_OVERRIDE}" 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 724fe9d14db..d5049707857 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go @@ -172,8 +172,7 @@ func (pr pruneResource) String() string { func getRESTMappings(mapper meta.RESTMapper, pruneResources *[]pruneResource) (namespaced, nonNamespaced []*meta.RESTMapping, err error) { if len(*pruneResources) == 0 { - // default whitelist - // TODO: need to handle the older api versions - e.g. v1beta1 jobs. Github issue: #35991 + // default allowlist *pruneResources = []pruneResource{ {"", "v1", "ConfigMap", true}, {"", "v1", "Endpoints", true}, @@ -186,7 +185,7 @@ func getRESTMappings(mapper meta.RESTMapper, pruneResources *[]pruneResource) (n {"", "v1", "Service", true}, {"batch", "v1", "Job", true}, {"batch", "v1beta1", "CronJob", true}, - {"extensions", "v1beta1", "Ingress", true}, + {"networking.k8s.io", "v1", "Ingress", true}, {"apps", "v1", "DaemonSet", true}, {"apps", "v1", "Deployment", true}, {"apps", "v1", "ReplicaSet", true},