From 81144d6c9ad4567180aae553d3183c9f732ae816 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 28 Aug 2020 10:58:32 -0400 Subject: [PATCH] Deprioritize extensions/v1beta1 in discovery --- cmd/kube-apiserver/app/aggregator.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmd/kube-apiserver/app/aggregator.go b/cmd/kube-apiserver/app/aggregator.go index 5b22406bdf4..38595535bed 100644 --- a/cmd/kube-apiserver/app/aggregator.go +++ b/cmd/kube-apiserver/app/aggregator.go @@ -234,9 +234,6 @@ type priority struct { // That ripples out every bit as far as you'd expect, so for 1.7 we'll include the list here instead of being built up during storage. var apiVersionPriorities = map[schema.GroupVersion]priority{ {Group: "", Version: "v1"}: {group: 18000, version: 1}, - // extensions is above the rest for CLI compatibility, though the level of unqualified resource compatibility we - // can reasonably expect seems questionable. - {Group: "extensions", Version: "v1beta1"}: {group: 17900, version: 1}, // to my knowledge, nothing below here collides {Group: "apps", Version: "v1"}: {group: 17800, version: 15}, {Group: "events.k8s.io", Version: "v1"}: {group: 17750, version: 15}, @@ -255,6 +252,7 @@ var apiVersionPriorities = map[schema.GroupVersion]priority{ {Group: "certificates.k8s.io", Version: "v1beta1"}: {group: 17300, version: 9}, {Group: "networking.k8s.io", Version: "v1"}: {group: 17200, version: 15}, {Group: "networking.k8s.io", Version: "v1beta1"}: {group: 17200, version: 9}, + {Group: "extensions", Version: "v1beta1"}: {group: 17150, version: 1}, // prioritize below networking.k8s.io, which contains the GA version of Ingress, the only resource remaining in extensions/v1beta1 {Group: "policy", Version: "v1beta1"}: {group: 17100, version: 9}, {Group: "rbac.authorization.k8s.io", Version: "v1"}: {group: 17000, version: 15}, {Group: "rbac.authorization.k8s.io", Version: "v1beta1"}: {group: 17000, version: 12},