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

remove the alpha features

Browse Source
This commit is contained in:
Chao Xu 2017-06-16 17:50:37 -07:00
parent ad4d965711
commit 68eb89a9f1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/master/BUILD
View File

@ -27,7 +27,6 @@ go_library(
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/apis/admission/install:go_default_library", "//pkg/apis/admission/install:go_default_library",
"//pkg/apis/admissionregistration/install:go_default_library", "//pkg/apis/admissionregistration/install:go_default_library",
"//pkg/apis/admissionregistration/v1alpha1:go_default_library",
"//pkg/apis/apps/install:go_default_library", "//pkg/apis/apps/install:go_default_library",
"//pkg/apis/apps/v1beta1:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library",
"//pkg/apis/authentication/install:go_default_library", "//pkg/apis/authentication/install:go_default_library",

7
pkg/master/master.go
View File

@ -35,7 +35,6 @@ import (
"k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/cmd/kube-apiserver/app/options"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"
admissionregistrationv1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1"
appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
authenticationv1 "k8s.io/kubernetes/pkg/apis/authentication/v1" authenticationv1 "k8s.io/kubernetes/pkg/apis/authentication/v1"
authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
@ -381,9 +380,9 @@ func (n nodeAddressProvider) externalAddresses() ([]string, error) {
func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig { func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
ret := serverstorage.NewResourceConfig() ret := serverstorage.NewResourceConfig()
// NOTE: GroupVersions listed here will be enabled by default. Don't put alpha versions in the list.
ret.EnableVersions( ret.EnableVersions(
apiv1.SchemeGroupVersion, apiv1.SchemeGroupVersion,
admissionregistrationv1alpha1.SchemeGroupVersion,
extensionsapiv1beta1.SchemeGroupVersion, extensionsapiv1beta1.SchemeGroupVersion,
batchapiv1.SchemeGroupVersion, batchapiv1.SchemeGroupVersion,
authenticationv1.SchemeGroupVersion, authenticationv1.SchemeGroupVersion,
@ -392,6 +391,10 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
appsv1beta1.SchemeGroupVersion, appsv1beta1.SchemeGroupVersion,
policyapiv1beta1.SchemeGroupVersion, policyapiv1beta1.SchemeGroupVersion,
rbacv1beta1.SchemeGroupVersion, rbacv1beta1.SchemeGroupVersion,
// Don't copy this pattern. We enable rbac/v1alpha1 and settings/v1laph1
// by default only because they were enabled in previous releases.
// See https://github.com/kubernetes/kubernetes/pull/47690.
// TODO: disable rbac/v1alpha1 and settings/v1alpha1 by default in 1.8
rbacv1alpha1.SchemeGroupVersion, rbacv1alpha1.SchemeGroupVersion,
settingv1alpha1.SchemeGroupVersion, settingv1alpha1.SchemeGroupVersion,
storageapiv1.SchemeGroupVersion, storageapiv1.SchemeGroupVersion,