From ddbae6c9d10edd048a25983b19d03248cf00701e Mon Sep 17 00:00:00 2001
From: Minhan Xia <mixia@google.com>
Date: Wed, 4 Sep 2019 16:24:40 -0700
Subject: [PATCH] use v1 zone topology key

---
 pkg/e2e/fixtures.go | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkg/e2e/fixtures.go b/pkg/e2e/fixtures.go
index 70f4ebdd6f..985bcc50ce 100644
--- a/pkg/e2e/fixtures.go
+++ b/pkg/e2e/fixtures.go
@@ -37,10 +37,6 @@ import (
 
 const (
 	echoheadersImage = "gcr.io/k8s-ingress-image-push/ingress-gce-echo-amd64:master"
-
-	// TODO: remove beta topology key once it is GAed
-	zoneBetaTopologyKey = "failure-domain.beta.kubernetes.io/zone"
-	zoneGATopologyKey   = "failure-domain.beta.kubernetes.io/zone"
 )
 
 // NoopModify does not modify the input deployment
@@ -56,20 +52,12 @@ func SpreadPodAcrossZones(deployment *apps.Deployment) {
 					Weight: int32(1),
 					PodAffinityTerm: v1.PodAffinityTerm{
 						LabelSelector: metav1.SetAsLabelSelector(labels.Set(podLabels)),
-						TopologyKey:   zoneBetaTopologyKey,
-					},
-				},
-				{
-					Weight: int32(2),
-					PodAffinityTerm: v1.PodAffinityTerm{
-						LabelSelector: metav1.SetAsLabelSelector(labels.Set(podLabels)),
-						TopologyKey:   zoneGATopologyKey,
+						TopologyKey:   v1.LabelZoneFailureDomain,
 					},
 				},
 			},
 		},
 	}
-
 }
 
 // CreateEchoService creates the pod and service serving echoheaders