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

test: fix integration test to always include bastion userdata

This commit is contained in:
Nicolas Vanheuverzwijn 2020-01-13 15:43:37 -05:00
parent eaa025effd
commit 8d3df18a51
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/kops/integration_test.go
View File

@ -417,17 +417,10 @@ func runTestAWS(t *testing.T, clusterName string, srcDir string, version string,
expectedFilenames = append(expectedFilenames, []string{ expectedFilenames = append(expectedFilenames, []string{
"aws_iam_role_bastions." + clusterName + "_policy", "aws_iam_role_bastions." + clusterName + "_policy",
"aws_iam_role_policy_bastions." + clusterName + "_policy", "aws_iam_role_policy_bastions." + clusterName + "_policy",
"aws_launch_configuration_bastion." + clusterName + "_user_data",
// bastions usually don't have any userdata
// "aws_launch_configuration_bastions." + clusterName + "_user_data",
}...) }...)
} }
} }
// Special case that tests a bastion with user-data
if srcDir == "bastionadditional_user-data" {
expectedFilenames = append(expectedFilenames, "aws_launch_configuration_bastion."+clusterName+"_user_data")
}
runTest(t, h, clusterName, srcDir, version, private, zones, expectedFilenames, "", nil, lifecycleOverrides) runTest(t, h, clusterName, srcDir, version, private, zones, expectedFilenames, "", nil, lifecycleOverrides)
} }
@ -457,9 +450,7 @@ func runTestPhase(t *testing.T, clusterName string, srcDir string, version strin
expectedFilenames = append(expectedFilenames, []string{ expectedFilenames = append(expectedFilenames, []string{
"aws_iam_role_bastions." + clusterName + "_policy", "aws_iam_role_bastions." + clusterName + "_policy",
"aws_iam_role_policy_bastions." + clusterName + "_policy", "aws_iam_role_policy_bastions." + clusterName + "_policy",
"aws_launch_configuration_bastion." + clusterName + "_user_data",
// bastions don't have any userdata
// "aws_launch_configuration_bastions." + clusterName + "_user_data",
}...) }...)
} }
} else if phase == cloudup.PhaseCluster { } else if phase == cloudup.PhaseCluster {