Move autoscaling e2e tests to a separate directory #43983
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package(default_visibility = ["//visibility:public"]) | ||
|
|
||
| licenses(["notice"]) | ||
|
|
||
| load( | ||
| "@io_bazel_rules_go//go:def.bzl", | ||
| "go_library", | ||
| ) | ||
|
|
||
| go_library( | ||
| name = "go_default_library", | ||
| srcs = [ | ||
| "cluster_size_autoscaling.go", | ||
| "dns_autoscaling.go", | ||
| "horizontal_pod_autoscaling.go", | ||
| ], | ||
| tags = ["automanaged"], | ||
| deps = [ | ||
| "//pkg/api/v1:go_default_library", | ||
| "//pkg/client/clientset_generated/clientset:go_default_library", | ||
| "//test/e2e/common:go_default_library", | ||
| "//test/e2e/framework:go_default_library", | ||
| "//test/e2e/scheduling:go_default_library", | ||
| "//test/utils:go_default_library", | ||
| "//vendor:github.com/golang/glog", | ||
| "//vendor:github.com/onsi/ginkgo", | ||
| "//vendor:github.com/onsi/gomega", | ||
| "//vendor:k8s.io/apimachinery/pkg/api/errors", | ||
| "//vendor:k8s.io/apimachinery/pkg/api/resource", | ||
| "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", | ||
| "//vendor:k8s.io/apimachinery/pkg/fields", | ||
| "//vendor:k8s.io/apimachinery/pkg/labels", | ||
| "//vendor:k8s.io/apimachinery/pkg/util/intstr", | ||
| "//vendor:k8s.io/apimachinery/pkg/util/sets", | ||
| "//vendor:k8s.io/apimachinery/pkg/util/uuid", | ||
| "//vendor:k8s.io/apimachinery/pkg/util/wait", | ||
| "//vendor:k8s.io/client-go/pkg/apis/policy/v1beta1", | ||
| ], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "package-srcs", | ||
| srcs = glob(["**"]), | ||
| tags = ["automanaged"], | ||
| visibility = ["//visibility:private"], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "all-srcs", | ||
| srcs = [":package-srcs"], | ||
| tags = ["automanaged"], | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| reviewers: | ||
| - mwielgus | ||
| - jszczepkowski | ||
| - MaciekPytel | ||
| approvers: | ||
| - mwielgus | ||
| - jszczepkowski | ||
| - MaciekPytel | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| /* | ||
|
There was a problem hiding this comment. I don't like the "size.go" name, but I don't have better suggestion, so let's leave :) |
||
| Copyright 2015 The Kubernetes Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package framework | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os/exec" | ||
| "regexp" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws/session" | ||
| "github.com/aws/aws-sdk-go/service/autoscaling" | ||
| awscloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" | ||
| ) | ||
|
|
||
| const ( | ||
| serveHostnameImage = "gcr.io/google_containers/serve_hostname:v1.4" | ||
| resizeNodeReadyTimeout = 2 * time.Minute | ||
| resizeNodeNotReadyTimeout = 2 * time.Minute | ||
| nodeReadinessTimeout = 3 * time.Minute | ||
| podNotReadyTimeout = 1 * time.Minute | ||
| podReadyTimeout = 2 * time.Minute | ||
| testPort = 9376 | ||
| ) | ||
|
|
||
| func ResizeGroup(group string, size int32) error { | ||
| if TestContext.ReportDir != "" { | ||
| CoreDump(TestContext.ReportDir) | ||
| defer CoreDump(TestContext.ReportDir) | ||
| } | ||
| if TestContext.Provider == "gce" || TestContext.Provider == "gke" { | ||
| // TODO: make this hit the compute API directly instead of shelling out to gcloud. | ||
| // TODO: make gce/gke implement InstanceGroups, so we can eliminate the per-provider logic | ||
| output, err := exec.Command("gcloud", "compute", "instance-groups", "managed", "resize", | ||
| group, fmt.Sprintf("--size=%v", size), | ||
| "--project="+TestContext.CloudConfig.ProjectID, "--zone="+TestContext.CloudConfig.Zone).CombinedOutput() | ||
| if err != nil { | ||
| Logf("Failed to resize node instance group: %v", string(output)) | ||
| } | ||
| return err | ||
| } else if TestContext.Provider == "aws" { | ||
| client := autoscaling.New(session.New()) | ||
| return awscloud.ResizeInstanceGroup(client, group, int(size)) | ||
| } else { | ||
| return fmt.Errorf("Provider does not support InstanceGroups") | ||
| } | ||
| } | ||
|
|
||
| func GetGroupNodes(group string) ([]string, error) { | ||
| if TestContext.Provider == "gce" || TestContext.Provider == "gke" { | ||
| // TODO: make this hit the compute API directly instead of shelling out to gcloud. | ||
| // TODO: make gce/gke implement InstanceGroups, so we can eliminate the per-provider logic | ||
| output, err := exec.Command("gcloud", "compute", "instance-groups", "managed", | ||
| "list-instances", group, "--project="+TestContext.CloudConfig.ProjectID, | ||
| "--zone="+TestContext.CloudConfig.Zone).CombinedOutput() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| re := regexp.MustCompile(".*RUNNING") | ||
| lines := re.FindAllString(string(output), -1) | ||
| for i, line := range lines { | ||
| lines[i] = line[:strings.Index(line, " ")] | ||
| } | ||
| return lines, nil | ||
| } else { | ||
| return nil, fmt.Errorf("provider does not support InstanceGroups") | ||
| } | ||
| } | ||
|
|
||
| func GroupSize(group string) (int, error) { | ||
| if TestContext.Provider == "gce" || TestContext.Provider == "gke" { | ||
| // TODO: make this hit the compute API directly instead of shelling out to gcloud. | ||
| // TODO: make gce/gke implement InstanceGroups, so we can eliminate the per-provider logic | ||
| output, err := exec.Command("gcloud", "compute", "instance-groups", "managed", | ||
| "list-instances", group, "--project="+TestContext.CloudConfig.ProjectID, | ||
| "--zone="+TestContext.CloudConfig.Zone).CombinedOutput() | ||
| if err != nil { | ||
| return -1, err | ||
| } | ||
| re := regexp.MustCompile("RUNNING") | ||
| return len(re.FindAllString(string(output), -1)), nil | ||
| } else if TestContext.Provider == "aws" { | ||
| client := autoscaling.New(session.New()) | ||
| instanceGroup, err := awscloud.DescribeInstanceGroup(client, group) | ||
| if err != nil { | ||
| return -1, fmt.Errorf("error describing instance group: %v", err) | ||
| } | ||
| if instanceGroup == nil { | ||
| return -1, fmt.Errorf("instance group not found: %s", group) | ||
| } | ||
| return instanceGroup.CurrentSize() | ||
| } else { | ||
| return -1, fmt.Errorf("provider does not support InstanceGroups") | ||
| } | ||
| } | ||
|
|
||
| func WaitForGroupSize(group string, size int32) error { | ||
| timeout := 30 * time.Minute | ||
| for start := time.Now(); time.Since(start) < timeout; time.Sleep(20 * time.Second) { | ||
| currentSize, err := GroupSize(group) | ||
| if err != nil { | ||
| Logf("Failed to get node instance group size: %v", err) | ||
| continue | ||
| } | ||
| if currentSize != int(size) { | ||
| Logf("Waiting for node instance group size %d, current size %d", size, currentSize) | ||
| continue | ||
| } | ||
| Logf("Node instance group has reached the desired size %d", size) | ||
| return nil | ||
| } | ||
| return fmt.Errorf("timeout waiting %v for node instance group size to be %d", timeout, size) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't have place to comment, so commenting here.
This won't work out of the box - you need to also modify:
https://github.com/kubernetes/kubernetes/blob/master/test/e2e/e2e_test.go#L25
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.