Merge pull request #58623 from MrHohn/use-gce-library-e2e

test/e2e/framework/google_compute.go

@@ -22,84 +22,12 @@ import (
 	"io/ioutil"
 	"os/exec"
 	"path/filepath"
-	"regexp"
 	"strings"
-	"time"
-
-	"github.com/golang/glog"
-
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
 )
 
 // TODO: These should really just use the GCE API client library or at least use
 // better formatted output from the --format flag.
 
-func CreateGCEStaticIP(name string) (string, error) {
-	// gcloud compute --project "abshah-kubernetes-001" addresses create "test-static-ip" --region "us-central1"
-	// abshah@abhidesk:~/go/src/code.google.com/p/google-api-go-client/compute/v1$ gcloud compute --project "abshah-kubernetes-001" addresses create "test-static-ip" --region "us-central1"
-	// Created [https://www.googleapis.com/compute/v1/projects/abshah-kubernetes-001/regions/us-central1/addresses/test-static-ip].
-	// NAME           REGION      ADDRESS       STATUS
-	// test-static-ip us-central1 104.197.143.7 RESERVED
-
-	var outputBytes []byte
-	var err error
-	region, err := gce.GetGCERegion(TestContext.CloudConfig.Zone)
-	if err != nil {
-		return "", fmt.Errorf("failed to convert zone to region: %v", err)
-	}
-	glog.Infof("Creating static IP with name %q in project %q in region %q", name, TestContext.CloudConfig.ProjectID, region)
-	for attempts := 0; attempts < 4; attempts++ {
-		outputBytes, err = exec.Command("gcloud", "compute", "addresses", "create",
-			name, "--project", TestContext.CloudConfig.ProjectID,
-			"--region", region, "-q", "--format=yaml").CombinedOutput()
-		if err == nil {
-			break
-		}
-		glog.Errorf("output from failed attempt to create static IP: %s", outputBytes)
-		time.Sleep(time.Duration(5*attempts) * time.Second)
-	}
-	if err != nil {
-		// Ditch the error, since the stderr in the output is what actually contains
-		// any useful info.
-		return "", fmt.Errorf("failed to create static IP: %s", outputBytes)
-	}
-	output := string(outputBytes)
-	if strings.Contains(output, "RESERVED") {
-		r, _ := regexp.Compile("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+")
-		staticIP := r.FindString(output)
-		if staticIP == "" {
-			return "", fmt.Errorf("static IP not found in gcloud command output: %v", output)
-		} else {
-			return staticIP, nil
-		}
-	} else {
-		return "", fmt.Errorf("static IP %q could not be reserved: %v", name, output)
-	}
-}
-
-func DeleteGCEStaticIP(name string) error {
-	// gcloud compute --project "abshah-kubernetes-001" addresses create "test-static-ip" --region "us-central1"
-	// abshah@abhidesk:~/go/src/code.google.com/p/google-api-go-client/compute/v1$ gcloud compute --project "abshah-kubernetes-001" addresses create "test-static-ip" --region "us-central1"
-	// Created [https://www.googleapis.com/compute/v1/projects/abshah-kubernetes-001/regions/us-central1/addresses/test-static-ip].
-	// NAME           REGION      ADDRESS       STATUS
-	// test-static-ip us-central1 104.197.143.7 RESERVED
-
-	region, err := gce.GetGCERegion(TestContext.CloudConfig.Zone)
-	if err != nil {
-		return fmt.Errorf("failed to convert zone to region: %v", err)
-	}
-	glog.Infof("Deleting static IP with name %q in project %q in region %q", name, TestContext.CloudConfig.ProjectID, region)
-	outputBytes, err := exec.Command("gcloud", "compute", "addresses", "delete",
-		name, "--project", TestContext.CloudConfig.ProjectID,
-		"--region", region, "-q").CombinedOutput()
-	if err != nil {
-		// Ditch the error, since the stderr in the output is what actually contains
-		// any useful info.
-		return fmt.Errorf("failed to delete static IP %q: %v", name, string(outputBytes))
-	}
-	return nil
-}
-
 // Returns master & node image string, or error
 func lookupClusterImageSources() (string, string, error) {
 	// Given args for a gcloud compute command, run it with other args, and return the values,

test/e2e/network/BUILD

@@ -46,6 +46,7 @@ go_library(
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/google.golang.org/api/compute/v0.alpha:go_default_library",
+        "//vendor/google.golang.org/api/compute/v1:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/api/networking/v1:go_default_library",
         "//vendor/k8s.io/api/rbac/v1beta1:go_default_library",

test/e2e/network/network_tiers.go

@@ -104,12 +104,14 @@ var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() {
 		// Test 3: create a standard-tierd LB with a user-requested IP.
 		By("reserving a static IP for the load balancer")
 		requestedAddrName := fmt.Sprintf("e2e-ext-lb-net-tier-%s", framework.RunId)
-		requestedIP, err := reserveAlphaRegionalAddress(requestedAddrName, gcecloud.NetworkTierStandard)
+		gceCloud, err := framework.GetGCECloud()
+		Expect(err).NotTo(HaveOccurred())
+		requestedIP, err := reserveAlphaRegionalAddress(gceCloud, requestedAddrName, gcecloud.NetworkTierStandard)
 		Expect(err).NotTo(HaveOccurred(), "failed to reserve a STANDARD tiered address")
 		defer func() {
 			if requestedAddrName != "" {
 				// Release GCE static address - this is not kube-managed and will not be automatically released.
-				if err := framework.DeleteGCEStaticIP(requestedAddrName); err != nil {
+				if err := gceCloud.DeleteRegionAddress(requestedAddrName, gceCloud.Region()); err != nil {
 					framework.Logf("failed to release static IP address %q: %v", requestedAddrName, err)
 				}
 			}
@@ -221,8 +223,7 @@ func clearNetworkTier(svc *v1.Service) {
 
 // TODO: add retries if this turns out to be flaky.
 // TODO(#51665): remove this helper function once Network Tiers becomes beta.
-func reserveAlphaRegionalAddress(name string, netTier gcecloud.NetworkTier) (string, error) {
-	cloud, err := framework.GetGCECloud()
+func reserveAlphaRegionalAddress(cloud *gcecloud.GCECloud, name string, netTier gcecloud.NetworkTier) (string, error) {
 	alphaAddr := &computealpha.Address{
 		Name:        name,
 		NetworkTier: netTier.ToGCEValue(),

test/e2e/network/service.go

@@ -25,6 +25,8 @@ import (
 	"strings"
 	"time"
 
+	compute "google.golang.org/api/compute/v1"
+
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -572,16 +574,23 @@ var _ = SIGDescribe("Services", func() {
 		if framework.ProviderIs("gce", "gke") {
 			By("creating a static load balancer IP")
 			staticIPName = fmt.Sprintf("e2e-external-lb-test-%s", framework.RunId)
-			requestedIP, err = framework.CreateGCEStaticIP(staticIPName)
+			gceCloud, err := framework.GetGCECloud()
+			Expect(err).NotTo(HaveOccurred())
+
+			err = gceCloud.ReserveRegionAddress(&compute.Address{Name: staticIPName}, gceCloud.Region())
 			defer func() {
 				if staticIPName != "" {
 					// Release GCE static IP - this is not kube-managed and will not be automatically released.
-					if err := framework.DeleteGCEStaticIP(staticIPName); err != nil {
+					if err := gceCloud.DeleteRegionAddress(staticIPName, gceCloud.Region()); err != nil {
 						framework.Logf("failed to release static IP %s: %v", staticIPName, err)
 					}
 				}
 			}()
 			Expect(err).NotTo(HaveOccurred())
+			reservedAddr, err := gceCloud.GetRegionAddress(staticIPName, gceCloud.Region())
+			Expect(err).NotTo(HaveOccurred())
+
+			requestedIP = reservedAddr.Address
 			framework.Logf("Allocated static load balancer IP: %s", requestedIP)
 		}
 
@@ -622,9 +631,11 @@ var _ = SIGDescribe("Services", func() {
 			// coming from, so this is first-aid rather than surgery).
 			By("demoting the static IP to ephemeral")
 			if staticIPName != "" {
+				gceCloud, err := framework.GetGCECloud()
+				Expect(err).NotTo(HaveOccurred())
 				// Deleting it after it is attached "demotes" it to an
 				// ephemeral IP, which can be auto-released.
-				if err := framework.DeleteGCEStaticIP(staticIPName); err != nil {
+				if err := gceCloud.DeleteRegionAddress(staticIPName, gceCloud.Region()); err != nil {
 					framework.Failf("failed to release static IP %s: %v", staticIPName, err)
 				}
 				staticIPName = ""