Merge pull request #96311 from thockin/kep-1659-topology-labels

Convert users of old failure-domain labels to new
This commit is contained in:
Kubernetes Prow Robot
2020-12-08 17:28:27 -08:00
committed by GitHub
16 changed files with 65 additions and 53 deletions

View File

@@ -11060,8 +11060,8 @@ func TestValidateServiceCreate(t *testing.T) {
tweakSvc: func(s *core.Service) {
s.Spec.TopologyKeys = []string{
"kubernetes.io/hostname",
"failure-domain.beta.kubernetes.io/zone",
"failure-domain.beta.kubernetes.io/region",
"topology.kubernetes.io/zone",
"topology.kubernetes.io/region",
v1.TopologyKeyAny,
}
},
@@ -11089,7 +11089,7 @@ func TestValidateServiceCreate(t *testing.T) {
s.Spec.TopologyKeys = []string{
"kubernetes.io/hostname",
v1.TopologyKeyAny,
"failure-domain.beta.kubernetes.io/zone",
"topology.kubernetes.io/zone",
}
},
numErrs: 1,
@@ -11100,7 +11100,7 @@ func TestValidateServiceCreate(t *testing.T) {
s.Spec.TopologyKeys = []string{
"kubernetes.io/hostname",
"kubernetes.io/hostname",
"failure-domain.beta.kubernetes.io/zone",
"topology.kubernetes.io/zone",
}
},
numErrs: 1,