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

admission controller: use attributes instead beta annotations

Browse Source
This commit is contained in:
Jan Safranek 2017-03-02 10:23:56 +01:00
parent 94e78eabc0
commit ca7cdc8c96
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/pkg/admission/storageclass/default/admission.go
View File

@ -113,10 +113,7 @@ func (c *claimDefaulterPlugin) Admit(a admission.Attributes) error {
}
glog.V(4).Infof("defaulting storage class for claim %s (generate: %s) to %s", pvc.Name, pvc.GenerateName, def.Name)
if pvc.ObjectMeta.Annotations == nil {
pvc.ObjectMeta.Annotations = map[string]string{}
}
pvc.Annotations[api.BetaStorageClassAnnotation] = def.Name
pvc.Spec.StorageClassName = &def.Name
return nil
}

22
plugin/pkg/admission/storageclass/default/admission_test.go
View File

@ -24,7 +24,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apiserver/pkg/admission"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/storage"
storageutil "k8s.io/kubernetes/pkg/apis/storage/util"
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion"
@ -32,6 +31,9 @@ import (
)
func TestAdmission(t *testing.T) {
empty := ""
foo := "foo"
defaultClass1 := &storage.StorageClass{
TypeMeta: metav1.TypeMeta{
Kind: "StorageClass",
@ -100,9 +102,9 @@ func TestAdmission(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "claimWithClass",
Namespace: "ns",
Annotations: map[string]string{
v1.BetaStorageClassAnnotation: "foo",
},
},
Spec: api.PersistentVolumeClaimSpec{
StorageClassName: &foo,
},
}
claimWithEmptyClass := &api.PersistentVolumeClaim{
@ -112,9 +114,9 @@ func TestAdmission(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "claimWithEmptyClass",
Namespace: "ns",
Annotations: map[string]string{
v1.BetaStorageClassAnnotation: "",
},
},
Spec: api.PersistentVolumeClaimSpec{
StorageClassName: &empty,
},
}
claimWithNoClass := &api.PersistentVolumeClaim{
@ -222,10 +224,8 @@ func TestAdmission(t *testing.T) {
}
class := ""
if claim.Annotations != nil {
if value, ok := claim.Annotations[v1.BetaStorageClassAnnotation]; ok {
class = value
}
if claim.Spec.StorageClassName != nil {
class = *claim.Spec.StorageClassName
}
if test.expectedClassName != "" && test.expectedClassName != class {
t.Errorf("Test %q: expected class name %q, got %q", test.name, test.expectedClassName, class)