github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 20:21:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102197 from liggitt/crd-lifecycle

Browse Source 
Propagate server version correctly to apiextensions-apiserver, stop serving v1beta1 CRDs
This commit is contained in:
Kubernetes Prow Robot
2021-05-21 00:28:57 -07:00
committed by GitHub
parent 0b80fbf978 13f567d0f2
commit 6eef9fe925
2 changed files with 5 additions and 1671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1668
api/openapi-spec/swagger.json generated
View File

File diff suppressed because it is too large Load Diff

8
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go
View File

@@ -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}