File tree 2 files changed +11
-3
lines changed
2 files changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ import (
10
10
kadmission "k8s.io/kubernetes/pkg/admission"
11
11
kextensions "k8s.io/kubernetes/pkg/apis/extensions"
12
12
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
13
+ "k8s.io/client-go/pkg/util/sets"
13
14
14
15
configlatest "github.com/openshift/origin/pkg/cmd/server/api/latest"
15
16
"github.com/openshift/origin/pkg/ingress/admission/api"
@@ -80,13 +81,13 @@ func (r *ingressAdmission) Admit(a kadmission.Attributes) error {
80
81
}
81
82
82
83
func haveHostnamesChanged (oldIngress , newIngress * kextensions.Ingress ) bool {
83
- m := make ( map [ string ] int )
84
+ hostnameSet := sets . NewString ( )
84
85
for _ , element := range oldIngress .Spec .Rules {
85
- m [ element .Host ] = 1
86
+ hostnameSet . Insert ( element .Host )
86
87
}
87
88
88
89
for _ , element := range newIngress .Spec .Rules {
89
- if _ , present := m [ element .Host ] ; ! present {
90
+ if present := hostnameSet . Has ( element .Host ) ; ! present {
90
91
return false
91
92
}
92
93
}
Original file line number Diff line number Diff line change @@ -67,6 +67,13 @@ func TestAdmission(t *testing.T) {
67
67
oldHost : "bar.com" ,
68
68
testName : "Upstream Hostname updates enabled" ,
69
69
},
70
+ {
71
+ admit : true ,
72
+ config : testConfigUpdateAllow (),
73
+ op : admission .Update ,
74
+ newHost : "foo.com" ,
75
+ testName : "add new hostname with upstream rules" ,
76
+ },
70
77
}
71
78
for _ , test := range tests {
72
79
if len (test .newHost ) > 0 {
You can’t perform that action at this time.
0 commit comments