github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deprecate warning for persistent volume admission controller

Browse Source
This commit is contained in:
Davanum Srinivas
2017-09-17 18:12:18 -04:00
parent 1a44e26670
commit cf3fe0b5d4
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-apiserver/app/options/plugins.go
View File

@@ -71,7 +71,7 @@ func RegisterAllAdmissionPlugins(plugins *admission.Plugins) {
autoprovision.Register(plugins) autoprovision.Register(plugins)
exists.Register(plugins) exists.Register(plugins)
noderestriction.Register(plugins) noderestriction.Register(plugins)
label.Register(plugins) label.Register(plugins) // DEPRECATED in favor of NewPersistentVolumeLabelController in CCM
podnodeselector.Register(plugins) podnodeselector.Register(plugins)
podpreset.Register(plugins) podpreset.Register(plugins)
podtolerationrestriction.Register(plugins) podtolerationrestriction.Register(plugins)

1
plugin/pkg/admission/persistentvolume/label/BUILD
View File

@@ -20,6 +20,7 @@ go_library(
"//pkg/kubeapiserver/admission:go_default_library", "//pkg/kubeapiserver/admission:go_default_library",
"//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/apis:go_default_library",
"//pkg/volume:go_default_library", "//pkg/volume:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/apiserver/pkg/admission:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission:go_default_library",
], ],
) )

6
plugin/pkg/admission/persistentvolume/label/admission.go
View File

@@ -22,6 +22,7 @@ import (
"io" "io"
"sync" "sync"
"github.com/golang/glog"
"k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/cloudprovider"
@@ -58,6 +59,11 @@ var _ kubeapiserveradmission.WantsCloudConfig = &persistentVolumeLabel{}
// //
// As a side effect, the cloud provider may block invalid or non-existent volumes. // As a side effect, the cloud provider may block invalid or non-existent volumes.
func NewPersistentVolumeLabel() *persistentVolumeLabel { func NewPersistentVolumeLabel() *persistentVolumeLabel {
// DEPRECATED: cloud-controller-manager will now start NewPersistentVolumeLabelController
// which does exactly what this admission controller used to do. So once GCE and AWS can
// run externally, we can remove this admission controller.
glog.Warning("PersistentVolumeLabel admission controller is deprecated. " +
"Please remove this controller from your configuration files and scripts.")
return &persistentVolumeLabel{ return &persistentVolumeLabel{
Handler: admission.NewHandler(admission.Create), Handler: admission.NewHandler(admission.Create),
} }