Skip to content

Commit 2366482

Browse files
Changed using a map to k8s.io/apimachinery/pkg/utils/sets and added a test for adding a hostname
1 parent e4bd6b4 commit 2366482

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

pkg/ingress/admission/ingress_admission.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"io"
88
"reflect"
99

10+
"k8s.io/client-go/pkg/util/sets"
1011
kadmission "k8s.io/kubernetes/pkg/admission"
1112
kextensions "k8s.io/kubernetes/pkg/apis/extensions"
1213
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -80,13 +81,13 @@ func (r *ingressAdmission) Admit(a kadmission.Attributes) error {
8081
}
8182

8283
func haveHostnamesChanged(oldIngress, newIngress *kextensions.Ingress) bool {
83-
m := make(map[string]int)
84+
hostnameSet := sets.NewString()
8485
for _, element := range oldIngress.Spec.Rules {
85-
m[element.Host] = 1
86+
hostnameSet.Insert(element.Host)
8687
}
8788

8889
for _, element := range newIngress.Spec.Rules {
89-
if _, present := m[element.Host]; !present {
90+
if present := hostnameSet.Has(element.Host); !present {
9091
return false
9192
}
9293
}

pkg/ingress/admission/ingress_admission_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@ func TestAdmission(t *testing.T) {
6767
oldHost: "bar.com",
6868
testName: "Upstream Hostname updates enabled",
6969
},
70+
{
71+
admit: true,
72+
config: testConfigUpdateAllow(),
73+
op: admission.Update,
74+
newHost: "foo.com",
75+
testName: "add new hostname with upstream rules",
76+
},
7077
}
7178
for _, test := range tests {
7279
if len(test.newHost) > 0 {

0 commit comments

Comments
 (0)