github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102710 from freehan/net-tier-fix

Browse Source 
fix net-tiers e2e test
This commit is contained in:
Kubernetes Prow Robot 2021-06-09 13:35:27 -07:00 committed by GitHub
commit 90132378f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/network/network_tiers.go
View File

@ -93,7 +93,7 @@ var _ = common.SIGDescribe("Services [Slow]", func() {
// Test 2: re-create a LB of a different tier for the updated Service.
ginkgo.By("updating the Service to use the premium (default) tier")
svc, err = jig.UpdateService(func(svc *v1.Service) {
clearNetworkTier(svc)
setNetworkTier(svc, string(gcecloud.NetworkTierAnnotationPremium))
})
framework.ExpectNoError(err)
// Verify that service has been updated properly.
@ -212,14 +212,6 @@ func setNetworkTier(svc *v1.Service, tier string) {
svc.ObjectMeta.Annotations[key] = tier
}
func clearNetworkTier(svc *v1.Service) {
key := gcecloud.NetworkTierAnnotationKey
if svc.ObjectMeta.Annotations == nil {
return
}
delete(svc.ObjectMeta.Annotations, key)
}
// TODO: add retries if this turns out to be flaky.
func reserveRegionalAddress(cloud *gcecloud.Cloud, name string, netTier cloud.NetworkTier) (string, error) {
Addr := &compute.Address{