From 7beefd0c9c638ae6efbc25cc3c5b87b9c13b43d8 Mon Sep 17 00:00:00 2001
From: Ashley Gau <agau4779@gmail.com>
Date: Tue, 22 May 2018 09:44:20 -0700
Subject: [PATCH] move NEG out of featuregate

---
 pkg/cloudprovider/providers/gce/gce_alpha.go  |  2 --
 .../providers/gce/gce_networkendpointgroup.go | 24 -------------------
 test/e2e/e2e.go                               |  7 ++----
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/pkg/cloudprovider/providers/gce/gce_alpha.go b/pkg/cloudprovider/providers/gce/gce_alpha.go
index 884b822cbac..0ce698aa98e 100644
--- a/pkg/cloudprovider/providers/gce/gce_alpha.go
+++ b/pkg/cloudprovider/providers/gce/gce_alpha.go
@@ -26,8 +26,6 @@ const (
 	// Allows Services backed by a GCP load balancer to choose what network
 	// tier to use. Currently supports "Standard" and "Premium" (default).
 	AlphaFeatureNetworkTiers = "NetworkTiers"
-
-	AlphaFeatureNetworkEndpointGroup = "NetworkEndpointGroup"
 )
 
 type AlphaFeatureGate struct {
diff --git a/pkg/cloudprovider/providers/gce/gce_networkendpointgroup.go b/pkg/cloudprovider/providers/gce/gce_networkendpointgroup.go
index efa4dcf4be9..03c55a9b549 100644
--- a/pkg/cloudprovider/providers/gce/gce_networkendpointgroup.go
+++ b/pkg/cloudprovider/providers/gce/gce_networkendpointgroup.go
@@ -41,9 +41,6 @@ func (gce *GCECloud) GetNetworkEndpointGroup(name string, zone string) (*compute
 	defer cancel()
 
 	mc := newNetworkEndpointGroupMetricContext("get", zone)
-	if err := gce.alphaFeatureEnabled(AlphaFeatureNetworkEndpointGroup); err != nil {
-		return nil, mc.Observe(err)
-	}
 	v, err := gce.c.AlphaNetworkEndpointGroups().Get(ctx, meta.ZonalKey(name, zone))
 	return v, mc.Observe(err)
 }
@@ -53,9 +50,6 @@ func (gce *GCECloud) ListNetworkEndpointGroup(zone string) ([]*computealpha.Netw
 	defer cancel()
 
 	mc := newNetworkEndpointGroupMetricContext("list", zone)
-	if err := gce.alphaFeatureEnabled(AlphaFeatureNetworkEndpointGroup); err != nil {
-		return nil, mc.Observe(err)
-	}
 	negs, err := gce.c.AlphaNetworkEndpointGroups().List(ctx, zone, filter.None)
 	return negs, mc.Observe(err)
 }
@@ -66,9 +60,6 @@ func (gce *GCECloud) AggregatedListNetworkEndpointGroup() (map[string][]*compute
 	defer cancel()
 
 	mc := newNetworkEndpointGroupMetricContext("aggregated_list", "")
-	if err := gce.alphaFeatureEnabled(AlphaFeatureNetworkEndpointGroup); err != nil {
-		return nil, mc.Observe(err)
-	}
 	// TODO: filter for the region the cluster is in.
 	all, err := gce.c.AlphaNetworkEndpointGroups().AggregatedList(ctx, filter.None)
 	if err != nil {
@@ -91,9 +82,6 @@ func (gce *GCECloud) CreateNetworkEndpointGroup(neg *computealpha.NetworkEndpoin
 	ctx, cancel := cloud.ContextWithCallTimeout()
 	defer cancel()
 
-	if err := gce.alphaFeatureEnabled(AlphaFeatureNetworkEndpointGroup); err != nil {
-		return err
-	}
 	mc := newNetworkEndpointGroupMetricContext("create", zone)
 	return mc.Observe(gce.c.AlphaNetworkEndpointGroups().Insert(ctx, meta.ZonalKey(neg.Name, zone), neg))
 }
@@ -102,9 +90,6 @@ func (gce *GCECloud) DeleteNetworkEndpointGroup(name string, zone string) error
 	ctx, cancel := cloud.ContextWithCallTimeout()
 	defer cancel()
 
-	if err := gce.alphaFeatureEnabled(AlphaFeatureNetworkEndpointGroup); err != nil {
-		return err
-	}
 	mc := newNetworkEndpointGroupMetricContext("delete", zone)
 	return mc.Observe(gce.c.AlphaNetworkEndpointGroups().Delete(ctx, meta.ZonalKey(name, zone)))
 }
@@ -114,9 +99,6 @@ func (gce *GCECloud) AttachNetworkEndpoints(name, zone string, endpoints []*comp
 	defer cancel()
 
 	mc := newNetworkEndpointGroupMetricContext("attach", zone)
-	if err := gce.alphaFeatureEnabled(AlphaFeatureNetworkEndpointGroup); err != nil {
-		return mc.Observe(err)
-	}
 	req := &computealpha.NetworkEndpointGroupsAttachEndpointsRequest{
 		NetworkEndpoints: endpoints,
 	}
@@ -128,9 +110,6 @@ func (gce *GCECloud) DetachNetworkEndpoints(name, zone string, endpoints []*comp
 	defer cancel()
 
 	mc := newNetworkEndpointGroupMetricContext("detach", zone)
-	if err := gce.alphaFeatureEnabled(AlphaFeatureNetworkEndpointGroup); err != nil {
-		return mc.Observe(err)
-	}
 	req := &computealpha.NetworkEndpointGroupsDetachEndpointsRequest{
 		NetworkEndpoints: endpoints,
 	}
@@ -142,9 +121,6 @@ func (gce *GCECloud) ListNetworkEndpoints(name, zone string, showHealthStatus bo
 	defer cancel()
 
 	mc := newNetworkEndpointGroupMetricContext("list_networkendpoints", zone)
-	if err := gce.alphaFeatureEnabled(AlphaFeatureNetworkEndpointGroup); err != nil {
-		return nil, mc.Observe(err)
-	}
 	healthStatus := "SKIP"
 	if showHealthStatus {
 		healthStatus = "SHOW"
diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
index 853cbc78e8c..e8a0a73a5c7 100644
--- a/test/e2e/e2e.go
+++ b/test/e2e/e2e.go
@@ -75,10 +75,6 @@ func setupProviderConfig() error {
 			managedZones = []string{zone}
 		}
 
-		gceAlphaFeatureGate := gcecloud.NewAlphaFeatureGate([]string{
-			gcecloud.AlphaFeatureNetworkEndpointGroup,
-		})
-
 		gceCloud, err := gcecloud.CreateGCECloud(&gcecloud.CloudConfig{
 			ApiEndpoint:        framework.TestContext.CloudConfig.ApiEndpoint,
 			ProjectID:          framework.TestContext.CloudConfig.ProjectID,
@@ -91,7 +87,8 @@ func setupProviderConfig() error {
 			NodeInstancePrefix: "",
 			TokenSource:        nil,
 			UseMetadataServer:  false,
-			AlphaFeatureGate:   gceAlphaFeatureGate})
+			AlphaFeatureGate:   gcecloud.NewAlphaFeatureGate([]string{}),
+		})
 
 		if err != nil {
 			return fmt.Errorf("Error building GCE/GKE provider: %v", err)