From 596c6fbf033491c8ec2d05770357598fb705e157 Mon Sep 17 00:00:00 2001 From: andrewsykim Date: Mon, 14 Jan 2019 20:29:10 -0500 Subject: [PATCH] e2e test for node deleted in cloud provider --- hack/.golint_failures | 1 + pkg/cloudprovider/providers/aws/aws.go | 14 ++-- .../providers/aws/aws_loadbalancer.go | 6 +- pkg/cloudprovider/providers/aws/instances.go | 48 ++++++------- .../providers/aws/instances_test.go | 26 +++---- test/e2e/BUILD | 2 + test/e2e/cloud/BUILD | 33 +++++++++ test/e2e/cloud/OWNERS | 14 ++++ test/e2e/cloud/framework.go | 23 +++++++ test/e2e/cloud/nodes.go | 68 +++++++++++++++++++ test/e2e/e2e_test.go | 1 + test/e2e/framework/nodes_util.go | 4 ++ test/e2e/framework/provider.go | 6 ++ test/e2e/framework/providers/aws/aws.go | 17 +++++ test/e2e/framework/providers/azure/azure.go | 5 ++ test/e2e/framework/providers/gce/gce.go | 7 ++ 16 files changed, 228 insertions(+), 47 deletions(-) create mode 100644 test/e2e/cloud/BUILD create mode 100644 test/e2e/cloud/OWNERS create mode 100644 test/e2e/cloud/framework.go create mode 100644 test/e2e/cloud/nodes.go diff --git a/hack/.golint_failures b/hack/.golint_failures index 094c57b722..a29241508b 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -695,6 +695,7 @@ test/e2e/apps test/e2e/auth test/e2e/autoscaling test/e2e/chaosmonkey +test/e2e/cloud test/e2e/common test/e2e/framework test/e2e/framework/ingress diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 74d1a89202..c7cddf43bd 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -1332,7 +1332,7 @@ func extractNodeAddresses(instance *ec2.Instance) ([]v1.NodeAddress, error) { // This method will not be called from the node that is requesting this ID. i.e. metadata service // and other local methods cannot be used here func (c *Cloud) NodeAddressesByProviderID(ctx context.Context, providerID string) ([]v1.NodeAddress, error) { - instanceID, err := kubernetesInstanceID(providerID).mapToAWSInstanceID() + instanceID, err := KubernetesInstanceID(providerID).MapToAWSInstanceID() if err != nil { return nil, err } @@ -1348,7 +1348,7 @@ func (c *Cloud) NodeAddressesByProviderID(ctx context.Context, providerID string // InstanceExistsByProviderID returns true if the instance with the given provider id still exists. // If false is returned with no error, the instance will be immediately deleted by the cloud controller manager. func (c *Cloud) InstanceExistsByProviderID(ctx context.Context, providerID string) (bool, error) { - instanceID, err := kubernetesInstanceID(providerID).mapToAWSInstanceID() + instanceID, err := KubernetesInstanceID(providerID).MapToAWSInstanceID() if err != nil { return false, err } @@ -1379,7 +1379,7 @@ func (c *Cloud) InstanceExistsByProviderID(ctx context.Context, providerID strin // InstanceShutdownByProviderID returns true if the instance is in safe state to detach volumes func (c *Cloud) InstanceShutdownByProviderID(ctx context.Context, providerID string) (bool, error) { - instanceID, err := kubernetesInstanceID(providerID).mapToAWSInstanceID() + instanceID, err := KubernetesInstanceID(providerID).MapToAWSInstanceID() if err != nil { return false, err } @@ -1435,7 +1435,7 @@ func (c *Cloud) InstanceID(ctx context.Context, nodeName types.NodeName) (string // This method will not be called from the node that is requesting this ID. i.e. metadata service // and other local methods cannot be used here func (c *Cloud) InstanceTypeByProviderID(ctx context.Context, providerID string) (string, error) { - instanceID, err := kubernetesInstanceID(providerID).mapToAWSInstanceID() + instanceID, err := KubernetesInstanceID(providerID).MapToAWSInstanceID() if err != nil { return "", err } @@ -1521,7 +1521,7 @@ func (c *Cloud) GetZone(ctx context.Context) (cloudprovider.Zone, error) { // This is particularly useful in external cloud providers where the kubelet // does not initialize node data. func (c *Cloud) GetZoneByProviderID(ctx context.Context, providerID string) (cloudprovider.Zone, error) { - instanceID, err := kubernetesInstanceID(providerID).mapToAWSInstanceID() + instanceID, err := KubernetesInstanceID(providerID).MapToAWSInstanceID() if err != nil { return cloudprovider.Zone{}, err } @@ -1602,7 +1602,7 @@ func newAWSInstance(ec2Service EC2, instance *ec2.Instance) *awsInstance { // Gets the full information about this instance from the EC2 API func (i *awsInstance) describeInstance() (*ec2.Instance, error) { - return describeInstance(i.ec2, awsInstanceID(i.awsID)) + return describeInstance(i.ec2, InstanceID(i.awsID)) } // Gets the mountDevice already assigned to the volume, or assigns an unused mountDevice. @@ -3787,7 +3787,7 @@ func (c *Cloud) getTaggedSecurityGroups() (map[string]*ec2.SecurityGroup, error) // Open security group ingress rules on the instances so that the load balancer can talk to them // Will also remove any security groups ingress rules for the load balancer that are _not_ needed for allInstances -func (c *Cloud) updateInstanceSecurityGroupsForLoadBalancer(lb *elb.LoadBalancerDescription, instances map[awsInstanceID]*ec2.Instance) error { +func (c *Cloud) updateInstanceSecurityGroupsForLoadBalancer(lb *elb.LoadBalancerDescription, instances map[InstanceID]*ec2.Instance) error { if c.cfg.Global.DisableSecurityGroupIngress { return nil } diff --git a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go b/pkg/cloudprovider/providers/aws/aws_loadbalancer.go index 351088312b..7a79e3d8fd 100644 --- a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go +++ b/pkg/cloudprovider/providers/aws/aws_loadbalancer.go @@ -863,7 +863,7 @@ func (c *Cloud) updateInstanceSecurityGroupsForNLBTraffic(actualGroups []*ec2.Se } // Add SG rules for a given NLB -func (c *Cloud) updateInstanceSecurityGroupsForNLB(mappings []nlbPortMapping, instances map[awsInstanceID]*ec2.Instance, lbName string, clientCidrs []string) error { +func (c *Cloud) updateInstanceSecurityGroupsForNLB(mappings []nlbPortMapping, instances map[InstanceID]*ec2.Instance, lbName string, clientCidrs []string) error { if c.cfg.Global.DisableSecurityGroupIngress { return nil } @@ -1380,7 +1380,7 @@ func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDesc } // Makes sure that exactly the specified hosts are registered as instances with the load balancer -func (c *Cloud) ensureLoadBalancerInstances(loadBalancerName string, lbInstances []*elb.Instance, instanceIDs map[awsInstanceID]*ec2.Instance) error { +func (c *Cloud) ensureLoadBalancerInstances(loadBalancerName string, lbInstances []*elb.Instance, instanceIDs map[InstanceID]*ec2.Instance) error { expected := sets.NewString() for id := range instanceIDs { expected.Insert(string(id)) @@ -1557,7 +1557,7 @@ func proxyProtocolEnabled(backend *elb.BackendServerDescription) bool { // findInstancesForELB gets the EC2 instances corresponding to the Nodes, for setting up an ELB // We ignore Nodes (with a log message) where the instanceid cannot be determined from the provider, // and we ignore instances which are not found -func (c *Cloud) findInstancesForELB(nodes []*v1.Node) (map[awsInstanceID]*ec2.Instance, error) { +func (c *Cloud) findInstancesForELB(nodes []*v1.Node) (map[InstanceID]*ec2.Instance, error) { // Map to instance ids ignoring Nodes where we cannot find the id (but logging) instanceIDs := mapToAWSInstanceIDsTolerant(nodes) diff --git a/pkg/cloudprovider/providers/aws/instances.go b/pkg/cloudprovider/providers/aws/instances.go index 60b10abc6a..1dbfe2b88a 100644 --- a/pkg/cloudprovider/providers/aws/instances.go +++ b/pkg/cloudprovider/providers/aws/instances.go @@ -34,26 +34,26 @@ import ( // awsInstanceRegMatch represents Regex Match for AWS instance. var awsInstanceRegMatch = regexp.MustCompile("^i-[^/]*$") -// awsInstanceID represents the ID of the instance in the AWS API, e.g. i-12345678 +// InstanceID represents the ID of the instance in the AWS API, e.g. i-12345678 // The "traditional" format is "i-12345678" // A new longer format is also being introduced: "i-12345678abcdef01" // We should not assume anything about the length or format, though it seems // reasonable to assume that instances will continue to start with "i-". -type awsInstanceID string +type InstanceID string -func (i awsInstanceID) awsString() *string { +func (i InstanceID) awsString() *string { return aws.String(string(i)) } -// kubernetesInstanceID represents the id for an instance in the kubernetes API; +// KubernetesInstanceID represents the id for an instance in the kubernetes API; // the following form // * aws://// // * aws://// // * -type kubernetesInstanceID string +type KubernetesInstanceID string -// mapToAWSInstanceID extracts the awsInstanceID from the kubernetesInstanceID -func (name kubernetesInstanceID) mapToAWSInstanceID() (awsInstanceID, error) { +// MapToAWSInstanceID extracts the InstanceID from the KubernetesInstanceID +func (name KubernetesInstanceID) MapToAWSInstanceID() (InstanceID, error) { s := string(name) if !strings.HasPrefix(s, "aws://") { @@ -85,17 +85,17 @@ func (name kubernetesInstanceID) mapToAWSInstanceID() (awsInstanceID, error) { return "", fmt.Errorf("Invalid format for AWS instance (%s)", name) } - return awsInstanceID(awsID), nil + return InstanceID(awsID), nil } -// mapToAWSInstanceID extracts the awsInstanceIDs from the Nodes, returning an error if a Node cannot be mapped -func mapToAWSInstanceIDs(nodes []*v1.Node) ([]awsInstanceID, error) { - var instanceIDs []awsInstanceID +// mapToAWSInstanceID extracts the InstanceIDs from the Nodes, returning an error if a Node cannot be mapped +func mapToAWSInstanceIDs(nodes []*v1.Node) ([]InstanceID, error) { + var instanceIDs []InstanceID for _, node := range nodes { if node.Spec.ProviderID == "" { return nil, fmt.Errorf("node %q did not have ProviderID set", node.Name) } - instanceID, err := kubernetesInstanceID(node.Spec.ProviderID).mapToAWSInstanceID() + instanceID, err := KubernetesInstanceID(node.Spec.ProviderID).MapToAWSInstanceID() if err != nil { return nil, fmt.Errorf("unable to parse ProviderID %q for node %q", node.Spec.ProviderID, node.Name) } @@ -105,15 +105,15 @@ func mapToAWSInstanceIDs(nodes []*v1.Node) ([]awsInstanceID, error) { return instanceIDs, nil } -// mapToAWSInstanceIDsTolerant extracts the awsInstanceIDs from the Nodes, skipping Nodes that cannot be mapped -func mapToAWSInstanceIDsTolerant(nodes []*v1.Node) []awsInstanceID { - var instanceIDs []awsInstanceID +// mapToAWSInstanceIDsTolerant extracts the InstanceIDs from the Nodes, skipping Nodes that cannot be mapped +func mapToAWSInstanceIDsTolerant(nodes []*v1.Node) []InstanceID { + var instanceIDs []InstanceID for _, node := range nodes { if node.Spec.ProviderID == "" { klog.Warningf("node %q did not have ProviderID set", node.Name) continue } - instanceID, err := kubernetesInstanceID(node.Spec.ProviderID).mapToAWSInstanceID() + instanceID, err := KubernetesInstanceID(node.Spec.ProviderID).MapToAWSInstanceID() if err != nil { klog.Warningf("unable to parse ProviderID %q for node %q", node.Spec.ProviderID, node.Name) continue @@ -125,7 +125,7 @@ func mapToAWSInstanceIDsTolerant(nodes []*v1.Node) []awsInstanceID { } // Gets the full information about this instance from the EC2 API -func describeInstance(ec2Client EC2, instanceID awsInstanceID) (*ec2.Instance, error) { +func describeInstance(ec2Client EC2, instanceID InstanceID) (*ec2.Instance, error) { request := &ec2.DescribeInstancesInput{ InstanceIds: []*string{instanceID.awsString()}, } @@ -164,9 +164,9 @@ func (c *instanceCache) describeAllInstancesUncached() (*allInstancesSnapshot, e return nil, err } - m := make(map[awsInstanceID]*ec2.Instance) + m := make(map[InstanceID]*ec2.Instance) for _, i := range instances { - id := awsInstanceID(aws.StringValue(i.InstanceId)) + id := InstanceID(aws.StringValue(i.InstanceId)) m[id] = i } @@ -191,9 +191,9 @@ type cacheCriteria struct { // If set to 0 (i.e. unset), cached values will not time out because of age. MaxAge time.Duration - // HasInstances is a list of awsInstanceIDs that must be in a cached snapshot for it to be considered valid. + // HasInstances is a list of InstanceIDs that must be in a cached snapshot for it to be considered valid. // If an instance is not found in the cached snapshot, the snapshot be ignored and we will re-fetch. - HasInstances []awsInstanceID + HasInstances []InstanceID } // describeAllInstancesCached returns all instances, using cached results if applicable @@ -257,12 +257,12 @@ func (s *allInstancesSnapshot) MeetsCriteria(criteria cacheCriteria) bool { // along with the timestamp for cache-invalidation purposes type allInstancesSnapshot struct { timestamp time.Time - instances map[awsInstanceID]*ec2.Instance + instances map[InstanceID]*ec2.Instance } // FindInstances returns the instances corresponding to the specified ids. If an id is not found, it is ignored. -func (s *allInstancesSnapshot) FindInstances(ids []awsInstanceID) map[awsInstanceID]*ec2.Instance { - m := make(map[awsInstanceID]*ec2.Instance) +func (s *allInstancesSnapshot) FindInstances(ids []InstanceID) map[InstanceID]*ec2.Instance { + m := make(map[InstanceID]*ec2.Instance) for _, id := range ids { instance := s.instances[id] if instance != nil { diff --git a/pkg/cloudprovider/providers/aws/instances_test.go b/pkg/cloudprovider/providers/aws/instances_test.go index 4e6e260d1e..d80d70b236 100644 --- a/pkg/cloudprovider/providers/aws/instances_test.go +++ b/pkg/cloudprovider/providers/aws/instances_test.go @@ -29,8 +29,8 @@ import ( func TestMapToAWSInstanceIDs(t *testing.T) { tests := []struct { - Kubernetes kubernetesInstanceID - Aws awsInstanceID + Kubernetes KubernetesInstanceID + Aws InstanceID ExpectError bool }{ { @@ -80,7 +80,7 @@ func TestMapToAWSInstanceIDs(t *testing.T) { } for _, test := range tests { - awsID, err := test.Kubernetes.mapToAWSInstanceID() + awsID, err := test.Kubernetes.MapToAWSInstanceID() if err != nil { if !test.ExpectError { t.Errorf("unexpected error parsing %s: %v", test.Kubernetes, err) @@ -139,18 +139,18 @@ func TestSnapshotMeetsCriteria(t *testing.T) { t.Errorf("Snapshot did not honor MaxAge") } - if snapshot.MeetsCriteria(cacheCriteria{HasInstances: []awsInstanceID{awsInstanceID("i-12345678")}}) { + if snapshot.MeetsCriteria(cacheCriteria{HasInstances: []InstanceID{InstanceID("i-12345678")}}) { t.Errorf("Snapshot did not honor HasInstances with missing instances") } - snapshot.instances = make(map[awsInstanceID]*ec2.Instance) - snapshot.instances[awsInstanceID("i-12345678")] = &ec2.Instance{} + snapshot.instances = make(map[InstanceID]*ec2.Instance) + snapshot.instances[InstanceID("i-12345678")] = &ec2.Instance{} - if !snapshot.MeetsCriteria(cacheCriteria{HasInstances: []awsInstanceID{awsInstanceID("i-12345678")}}) { + if !snapshot.MeetsCriteria(cacheCriteria{HasInstances: []InstanceID{InstanceID("i-12345678")}}) { t.Errorf("Snapshot did not honor HasInstances with matching instances") } - if snapshot.MeetsCriteria(cacheCriteria{HasInstances: []awsInstanceID{awsInstanceID("i-12345678"), awsInstanceID("i-00000000")}}) { + if snapshot.MeetsCriteria(cacheCriteria{HasInstances: []InstanceID{InstanceID("i-12345678"), InstanceID("i-00000000")}}) { t.Errorf("Snapshot did not honor HasInstances with partially matching instances") } } @@ -170,22 +170,22 @@ func TestOlderThan(t *testing.T) { func TestSnapshotFindInstances(t *testing.T) { snapshot := &allInstancesSnapshot{} - snapshot.instances = make(map[awsInstanceID]*ec2.Instance) + snapshot.instances = make(map[InstanceID]*ec2.Instance) { - id := awsInstanceID("i-12345678") + id := InstanceID("i-12345678") snapshot.instances[id] = &ec2.Instance{InstanceId: id.awsString()} } { - id := awsInstanceID("i-23456789") + id := InstanceID("i-23456789") snapshot.instances[id] = &ec2.Instance{InstanceId: id.awsString()} } - instances := snapshot.FindInstances([]awsInstanceID{awsInstanceID("i-12345678"), awsInstanceID("i-23456789"), awsInstanceID("i-00000000")}) + instances := snapshot.FindInstances([]InstanceID{InstanceID("i-12345678"), InstanceID("i-23456789"), InstanceID("i-00000000")}) if len(instances) != 2 { t.Errorf("findInstances returned %d results, expected 2", len(instances)) } - for _, id := range []awsInstanceID{awsInstanceID("i-12345678"), awsInstanceID("i-23456789")} { + for _, id := range []InstanceID{InstanceID("i-12345678"), InstanceID("i-23456789")} { i := instances[id] if i == nil { t.Errorf("findInstances did not return %s", id) diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 2939f54c7a..b0d0e531ec 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -16,6 +16,7 @@ go_test( "//test/e2e/apps:go_default_library", "//test/e2e/auth:go_default_library", "//test/e2e/autoscaling:go_default_library", + "//test/e2e/cloud:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/testfiles:go_default_library", @@ -104,6 +105,7 @@ filegroup( "//test/e2e/auth:all-srcs", "//test/e2e/autoscaling:all-srcs", "//test/e2e/chaosmonkey:all-srcs", + "//test/e2e/cloud:all-srcs", "//test/e2e/common:all-srcs", "//test/e2e/framework:all-srcs", "//test/e2e/generated:all-srcs", diff --git a/test/e2e/cloud/BUILD b/test/e2e/cloud/BUILD new file mode 100644 index 0000000000..9bc6709398 --- /dev/null +++ b/test/e2e/cloud/BUILD @@ -0,0 +1,33 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = [ + "framework.go", + "nodes.go", + ], + importpath = "k8s.io/kubernetes/test/e2e/cloud", + visibility = ["//visibility:public"], + deps = [ + "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//test/e2e/framework:go_default_library", + "//vendor/github.com/onsi/ginkgo:go_default_library", + "//vendor/github.com/onsi/gomega:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/test/e2e/cloud/OWNERS b/test/e2e/cloud/OWNERS new file mode 100644 index 0000000000..0805f928cc --- /dev/null +++ b/test/e2e/cloud/OWNERS @@ -0,0 +1,14 @@ +# See the OWNERS docs at https://go.k8s.io/owners +approvers: +- andrewsykim +- cheftako +- mcrute +- d-nishi +reviewers: +- andrewsykim +- cheftako +- mcrute +- d-nishi + +labels: +- sig/cloud-provider diff --git a/test/e2e/cloud/framework.go b/test/e2e/cloud/framework.go new file mode 100644 index 0000000000..6f6ae11669 --- /dev/null +++ b/test/e2e/cloud/framework.go @@ -0,0 +1,23 @@ +/* +Copyright 2019 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 cloud + +import "k8s.io/kubernetes/test/e2e/framework" + +func SIGDescribe(text string, body func()) bool { + return framework.KubeDescribe("[sig-cloud-provider] "+text, body) +} diff --git a/test/e2e/cloud/nodes.go b/test/e2e/cloud/nodes.go new file mode 100644 index 0000000000..a3e8e0315a --- /dev/null +++ b/test/e2e/cloud/nodes.go @@ -0,0 +1,68 @@ +/* +Copyright 2019 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 cloud + +import ( + "time" + + apierrs "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/kubernetes/test/e2e/framework" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" +) + +var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() { + f := framework.NewDefaultFramework("cloudprovider") + var c clientset.Interface + + BeforeEach(func() { + // Only supported in AWS/GCE because those are the only cloud providers + // where E2E test are currently running. + framework.SkipUnlessProviderIs("aws", "gce", "gke") + c = f.ClientSet + }) + + It("should be deleted on API server if it doesn't exist in the cloud provider", func() { + By("deleting a node on the cloud provider") + + nodeDeleteCandidates := framework.GetReadySchedulableNodesOrDie(c) + nodeToDelete := nodeDeleteCandidates.Items[0] + + origNodes := framework.GetReadyNodesIncludingTaintedOrDie(c) + framework.Logf("Original number of ready nodes: %d", len(origNodes.Items)) + + err := framework.DeleteNodeOnCloudProvider(&nodeToDelete) + if err != nil { + framework.Failf("failed to delete node %q, err: %q", nodeToDelete.Name, err) + } + + newNodes, err := framework.CheckNodesReady(c, len(origNodes.Items)-1, 5*time.Minute) + Expect(err).To(BeNil()) + Expect(len(newNodes)).To(Equal(len(origNodes.Items) - 1)) + + _, err = c.CoreV1().Nodes().Get(nodeToDelete.Name, metav1.GetOptions{}) + if err == nil { + framework.Failf("node %q still exists when it should be deleted", nodeToDelete.Name) + } else if !apierrs.IsNotFound(err) { + framework.Failf("failed to get node %q err: %q", nodeToDelete.Name, err) + } + + }) +}) diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index d7028ebfed..e792a86f73 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -32,6 +32,7 @@ import ( _ "k8s.io/kubernetes/test/e2e/apps" _ "k8s.io/kubernetes/test/e2e/auth" _ "k8s.io/kubernetes/test/e2e/autoscaling" + _ "k8s.io/kubernetes/test/e2e/cloud" _ "k8s.io/kubernetes/test/e2e/common" _ "k8s.io/kubernetes/test/e2e/instrumentation" _ "k8s.io/kubernetes/test/e2e/kubectl" diff --git a/test/e2e/framework/nodes_util.go b/test/e2e/framework/nodes_util.go index 60e238185f..f0587c0d56 100644 --- a/test/e2e/framework/nodes_util.go +++ b/test/e2e/framework/nodes_util.go @@ -394,3 +394,7 @@ func (k *NodeKiller) kill(nodes []v1.Node) { } wg.Wait() } + +func DeleteNodeOnCloudProvider(node *v1.Node) error { + return TestContext.CloudConfig.Provider.DeleteNode(node) +} diff --git a/test/e2e/framework/provider.go b/test/e2e/framework/provider.go index 7c75b15ee2..c3e7851f4f 100644 --- a/test/e2e/framework/provider.go +++ b/test/e2e/framework/provider.go @@ -86,6 +86,8 @@ type ProviderInterface interface { GetGroupNodes(group string) ([]string, error) GroupSize(group string) (int, error) + DeleteNode(node *v1.Node) error + CreatePD(zone string) (string, error) DeletePD(pdName string) error CreatePVSource(zone, diskName string) (*v1.PersistentVolumeSource, error) @@ -115,6 +117,10 @@ func (n NullProvider) GroupSize(group string) (int, error) { return -1, fmt.Errorf("provider does not support InstanceGroups") } +func (n NullProvider) DeleteNode(node *v1.Node) error { + return fmt.Errorf("provider does not support DeleteNode") +} + func (n NullProvider) CreatePD(zone string) (string, error) { return "", fmt.Errorf("provider does not support volume creation") } diff --git a/test/e2e/framework/providers/aws/aws.go b/test/e2e/framework/providers/aws/aws.go index 9de9904545..1514ee715b 100644 --- a/test/e2e/framework/providers/aws/aws.go +++ b/test/e2e/framework/providers/aws/aws.go @@ -63,6 +63,23 @@ func (p *Provider) GroupSize(group string) (int, error) { return instanceGroup.CurrentSize() } +func (p *Provider) DeleteNode(node *v1.Node) error { + client := newAWSClient("") + + instanceID, err := awscloud.KubernetesInstanceID(node.Spec.ProviderID).MapToAWSInstanceID() + if err != nil { + return err + } + + req := &ec2.TerminateInstancesInput{ + InstanceIds: []*string{ + aws.String(string(instanceID)), + }, + } + _, err = client.TerminateInstances(req) + return err +} + func (p *Provider) CreatePD(zone string) (string, error) { client := newAWSClient(zone) request := &ec2.CreateVolumeInput{} diff --git a/test/e2e/framework/providers/azure/azure.go b/test/e2e/framework/providers/azure/azure.go index e3f61606a8..e001778f4b 100644 --- a/test/e2e/framework/providers/azure/azure.go +++ b/test/e2e/framework/providers/azure/azure.go @@ -17,6 +17,7 @@ limitations under the License. package azure import ( + "errors" "fmt" "os" @@ -52,6 +53,10 @@ type Provider struct { azureCloud *azure.Cloud } +func (p *Provider) DeleteNode(node *v1.Node) error { + return errors.New("not implemented yet") +} + func (p *Provider) CreatePD(zone string) (string, error) { pdName := fmt.Sprintf("%s-%s", framework.TestContext.Prefix, string(uuid.NewUUID())) _, diskURI, _, err := p.azureCloud.CreateVolume(pdName, "" /* account */, "" /* sku */, "" /* location */, 1 /* sizeGb */) diff --git a/test/e2e/framework/providers/gce/gce.go b/test/e2e/framework/providers/gce/gce.go index 9236ef1340..86fa401ca5 100644 --- a/test/e2e/framework/providers/gce/gce.go +++ b/test/e2e/framework/providers/gce/gce.go @@ -190,6 +190,13 @@ func getGCEZoneForGroup(group string) (string, error) { return zone, nil } +func (p *Provider) DeleteNode(node *v1.Node) error { + zone := framework.TestContext.CloudConfig.Zone + project := framework.TestContext.CloudConfig.ProjectID + + return p.gceCloud.DeleteInstance(project, zone, node.Name) +} + func (p *Provider) CreatePD(zone string) (string, error) { pdName := fmt.Sprintf("%s-%s", framework.TestContext.Prefix, string(uuid.NewUUID()))