github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #73555 from bsalamat/priority_to_ga

Browse Source 
Graduate PriorityClass API to GA
This commit is contained in:
Kubernetes Prow Robot
2019-02-22 16:14:49 -08:00
committed by GitHub
parent 95e5705faf 59da8af4b4
commit 3afa003126
76 changed files with 3188 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/master/master.go
View File

@@ -51,6 +51,7 @@ import (
rbacv1 "k8s.io/api/rbac/v1"
rbacv1alpha1 "k8s.io/api/rbac/v1alpha1"
rbacv1beta1 "k8s.io/api/rbac/v1beta1"
schedulingapiv1 "k8s.io/api/scheduling/v1"
schedulingv1alpha1 "k8s.io/api/scheduling/v1alpha1"
schedulingapiv1beta1 "k8s.io/api/scheduling/v1beta1"
settingsv1alpha1 "k8s.io/api/settings/v1alpha1"
@@ -495,6 +496,7 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
storageapiv1.SchemeGroupVersion,
storageapiv1beta1.SchemeGroupVersion,
schedulingapiv1beta1.SchemeGroupVersion,
schedulingapiv1.SchemeGroupVersion,
)
// enable non-deprecated beta resources in extensions/v1beta1 explicitly so we have a full list of what's possible to serve
ret.EnableResources(