Propagate server version correctly to apiextensions-apiserver, stop serving v1beta1 CRDs

2021-05-20 20:23:53 -04:00
parent f52ab3845d
commit 13f567d0f2
2 changed files with 5 additions and 1671 deletions
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go
@@ -116,9 +116,11 @@ func (cfg *Config) Complete() CompletedConfig {
 	}

 	c.GenericConfig.EnableDiscovery = false
-	c.GenericConfig.Version = &version.Info{
-		Major: "0",
-		Minor: "1",
+	if c.GenericConfig.Version == nil {
+		c.GenericConfig.Version = &version.Info{
+			Major: "0",
+			Minor: "1",
+		}
 	}

 	return CompletedConfig{&c}