kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4539 from chrislovecnm/fixing-tests 

Fixing integration tests
This commit is contained in:
k8s-ci-robot 2018-02-28 11:20:47 -08:00 committed by GitHub
parent 65ba5391d1 5fef961439
commit 7d722c359c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View File

@ -90,7 +90,7 @@ resource "aws_autoscaling_group" "bastion-bastionuserdata-example-com" {
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupMinSize", "GroupMaxSize", "GroupDesiredCapacity", "GroupInServiceInstances", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
resource "aws_autoscaling_group" "master-us-test-1a-masters-bastionuserdata-example-com" {
@ -119,7 +119,7 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-bastionuserdata-exam
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupMinSize", "GroupMaxSize", "GroupDesiredCapacity", "GroupInServiceInstances", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
resource "aws_autoscaling_group" "nodes-bastionuserdata-example-com" {
@ -148,7 +148,7 @@ resource "aws_autoscaling_group" "nodes-bastionuserdata-example-com" {
}
metrics_granularity = "1Minute"
enabled_metrics = ["GroupMinSize", "GroupMaxSize", "GroupDesiredCapacity", "GroupInServiceInstances", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
enabled_metrics = ["GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"]
}
resource "aws_ebs_volume" "us-test-1a-etcd-events-bastionuserdata-example-com" {
@ -293,8 +293,9 @@ resource "aws_internet_gateway" "bastionuserdata-example-com" {
vpc_id = "${aws_vpc.bastionuserdata-example-com.id}"
tags = {
KubernetesCluster = "bastionuserdata.example.com"
Name = "bastionuserdata.example.com"
KubernetesCluster = "bastionuserdata.example.com"
Name = "bastionuserdata.example.com"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
@ -405,8 +406,9 @@ resource "aws_route_table" "bastionuserdata-example-com" {
vpc_id = "${aws_vpc.bastionuserdata-example-com.id}"
tags = {
KubernetesCluster = "bastionuserdata.example.com"
Name = "bastionuserdata.example.com"
KubernetesCluster = "bastionuserdata.example.com"
Name = "bastionuserdata.example.com"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
@ -414,8 +416,9 @@ resource "aws_route_table" "private-us-test-1a-bastionuserdata-example-com" {
vpc_id = "${aws_vpc.bastionuserdata-example-com.id}"
tags = {
KubernetesCluster = "bastionuserdata.example.com"
Name = "private-us-test-1a.bastionuserdata.example.com"
KubernetesCluster = "bastionuserdata.example.com"
Name = "private-us-test-1a.bastionuserdata.example.com"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
@ -700,8 +703,9 @@ resource "aws_vpc_dhcp_options" "bastionuserdata-example-com" {
domain_name_servers = ["AmazonProvidedDNS"]
tags = {
KubernetesCluster = "bastionuserdata.example.com"
Name = "bastionuserdata.example.com"
KubernetesCluster = "bastionuserdata.example.com"
Name = "bastionuserdata.example.com"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}