From 8d3df18a51009a74718925dd0792f72353f897e8 Mon Sep 17 00:00:00 2001 From: Nicolas Vanheuverzwijn Date: Mon, 13 Jan 2020 15:43:37 -0500 Subject: [PATCH] test: fix integration test to always include bastion userdata --- cmd/kops/integration_test.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go index 0a2aae0ab2..f77a71904e 100644 --- a/cmd/kops/integration_test.go +++ b/cmd/kops/integration_test.go @@ -417,17 +417,10 @@ func runTestAWS(t *testing.T, clusterName string, srcDir string, version string, expectedFilenames = append(expectedFilenames, []string{ "aws_iam_role_bastions." + clusterName + "_policy", "aws_iam_role_policy_bastions." + clusterName + "_policy", - - // bastions usually don't have any userdata - // "aws_launch_configuration_bastions." + clusterName + "_user_data", + "aws_launch_configuration_bastion." + 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) } @@ -457,9 +450,7 @@ func runTestPhase(t *testing.T, clusterName string, srcDir string, version strin expectedFilenames = append(expectedFilenames, []string{ "aws_iam_role_bastions." + clusterName + "_policy", "aws_iam_role_policy_bastions." + clusterName + "_policy", - - // bastions don't have any userdata - // "aws_launch_configuration_bastions." + clusterName + "_user_data", + "aws_launch_configuration_bastion." + clusterName + "_user_data", }...) } } else if phase == cloudup.PhaseCluster {