Remove hard-coded annotation and don't use map pointers
This commit is contained in:
parent
c2550930b1
commit
5c30820d1f
43 changed files with 179 additions and 173 deletions
|
|
@ -30,7 +30,7 @@ import (
|
|||
"k8s.io/ingress-nginx/test/e2e/framework"
|
||||
)
|
||||
|
||||
func startIngress(f *framework.Framework, annotations *map[string]string) map[string]bool {
|
||||
func startIngress(f *framework.Framework, annotations map[string]string) map[string]bool {
|
||||
host := "upstream-hash-by.foo.com"
|
||||
|
||||
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, annotations)
|
||||
|
|
@ -87,7 +87,7 @@ var _ = framework.IngressNginxDescribe("Annotations - UpstreamHashBy", func() {
|
|||
"nginx.ingress.kubernetes.io/upstream-hash-by": "$request_uri",
|
||||
}
|
||||
|
||||
podMap := startIngress(f, &annotations)
|
||||
podMap := startIngress(f, annotations)
|
||||
Expect(len(podMap)).Should(Equal(1))
|
||||
|
||||
})
|
||||
|
|
@ -99,7 +99,7 @@ var _ = framework.IngressNginxDescribe("Annotations - UpstreamHashBy", func() {
|
|||
"nginx.ingress.kubernetes.io/upstream-hash-by-subset-size": "3",
|
||||
}
|
||||
|
||||
podMap := startIngress(f, &annotations)
|
||||
podMap := startIngress(f, annotations)
|
||||
Expect(len(podMap)).Should(Equal(3))
|
||||
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue