DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove hard-coded annotation and don't use map pointers

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-12-13 02:47:11 -03:00
parent c2550930b1
commit 5c30820d1f
43 changed files with 179 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/ingress/controller/store/store_test.go
View file

@ -39,6 +39,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/envtest"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/k8s"
"k8s.io/ingress-nginx/test/e2e/framework"
@ -216,7 +217,7 @@ func TestStore(t *testing.T) {
Name: "custom-class",
Namespace: ns,
Annotations: map[string]string{
"kubernetes.io/ingress.class": "something",
class.IngressKey: "something",
},
},
Spec: networking.IngressSpec{
@ -331,7 +332,7 @@ func TestStore(t *testing.T) {
Name: "custom-class",
Namespace: ns,
Annotations: map[string]string{
"kubernetes.io/ingress.class": "something",
class.IngressKey: "something",
},
},
Spec: networking.IngressSpec{
@ -874,7 +875,7 @@ func TestListIngresses(t *testing.T) {
Name: "test-2",
Namespace: "testns",
Annotations: map[string]string{
"kubernetes.io/ingress.class": "something",
class.IngressKey: "something",
},
CreationTimestamp: metav1.NewTime(time.Now()),
},
@ -924,7 +925,7 @@ func TestListIngresses(t *testing.T) {
Name: "test-4",
Namespace: "testns",
Annotations: map[string]string{
"kubernetes.io/ingress.class": "nginx",
class.IngressKey: "nginx",
},
CreationTimestamp: metav1.NewTime(time.Now()),
},