Skip to content

Commit 27a05ec

Browse files
authored
Merge pull request #1069 from songjiaxun/master
Revert all the new service enable logic
2 parents d504436 + 6dec259 commit 27a05ec

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

test/k8s-integration/cluster.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"os"
88
"os/exec"
99
"path/filepath"
10-
"regexp"
1110
"strconv"
1211
"strings"
1312

@@ -161,19 +160,6 @@ func setImageTypeEnvs(imageType string) error {
161160
}
162161

163162
func clusterUpGKE(gceZone, gceRegion string, numNodes int, numWindowsNodes int, imageType string, useManagedDriver bool) error {
164-
// Enable the GKE service API
165-
var gkeServiceName string
166-
gkeURL := os.Getenv("CLOUDSDK_API_ENDPOINT_OVERRIDES_CONTAINER")
167-
if gkeURL == "" {
168-
gkeServiceName = "container.googleapis.com"
169-
} else {
170-
gkeServiceName = regexp.MustCompile("https://(.+)/").FindStringSubmatch(gkeURL)[1]
171-
}
172-
_, err := exec.Command("gcloud", "services", "enable", gkeServiceName).CombinedOutput()
173-
if err != nil {
174-
return fmt.Errorf("failed to enable GKE service API %q: %v", gkeServiceName, err)
175-
}
176-
177163
locationArg, locationVal, err := gkeLocationArgs(gceZone, gceRegion)
178164
if err != nil {
179165
return err

0 commit comments

Comments
 (0)