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

Promote ingressclass.kubernetes.io/is-default-class annotation to networking/v1

Browse Source
This commit is contained in:
Mengjiao Liu 2021-07-09 15:39:21 +08:00
parent 617064d732
commit 792665e1ea
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/pkg/admission/network/defaultingressclass/admission.go
View File

@ -133,7 +133,7 @@ func getDefaultClass(lister networkingv1listers.IngressClassLister) (*networking
defaultClasses := []*networkingv1.IngressClass{} defaultClasses := []*networkingv1.IngressClass{}
for _, class := range list { for _, class := range list {
if class.Annotations[networkingv1beta1.AnnotationIsDefaultIngressClass] == "true" { if class.Annotations[networkingv1.AnnotationIsDefaultIngressClass] == "true" {
defaultClasses = append(defaultClasses, class) defaultClasses = append(defaultClasses, class)
} }
} }

8
plugin/pkg/admission/network/defaultingressclass/admission_test.go
View File

@ -43,7 +43,7 @@ func TestAdmission(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "default1", Name: "default1",
Annotations: map[string]string{ Annotations: map[string]string{
networkingv1beta1.AnnotationIsDefaultIngressClass: "true", networkingv1.AnnotationIsDefaultIngressClass: "true",
}, },
}, },
} }
@ -51,7 +51,7 @@ func TestAdmission(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "default2", Name: "default2",
Annotations: map[string]string{ Annotations: map[string]string{
networkingv1beta1.AnnotationIsDefaultIngressClass: "true", networkingv1.AnnotationIsDefaultIngressClass: "true",
}, },
}, },
} }
@ -63,7 +63,7 @@ func TestAdmission(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "nondefault1", Name: "nondefault1",
Annotations: map[string]string{ Annotations: map[string]string{
networkingv1beta1.AnnotationIsDefaultIngressClass: "false", networkingv1.AnnotationIsDefaultIngressClass: "false",
}, },
}, },
} }
@ -84,7 +84,7 @@ func TestAdmission(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "nondefault2", Name: "nondefault2",
Annotations: map[string]string{ Annotations: map[string]string{
networkingv1beta1.AnnotationIsDefaultIngressClass: "", networkingv1.AnnotationIsDefaultIngressClass: "",
}, },
}, },
} }