tests: set AllInstanceGroups alongside InstanceGroups

kubernetes · Nov 9, 2024 · ca61335 · ca61335
1 parent 1683894
commit ca61335
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 0 deletions.
diff --git a/pkg/model/awsmodel/autoscalinggroup_test.go b/pkg/model/awsmodel/autoscalinggroup_test.go
@@ -67,6 +67,7 @@ func TestRootVolumeOptimizationFlag(t *testing.T) {
 			KopsModelContext: &model.KopsModelContext{
 				IAMModelContext: iam.IAMModelContext{Cluster: cluster},
 				SSHPublicKeys:   k,
+				AllInstanceGroups: igs,
 				InstanceGroups:  igs,
 			},
 		},
@@ -179,12 +180,14 @@ func TestAPIServerAdditionalSecurityGroupsWithNLB(t *testing.T) {
 			KopsModelContext: &model.KopsModelContext{
 				IAMModelContext: iam.IAMModelContext{Cluster: cluster},
 				SSHPublicKeys:   [][]byte{[]byte(sshPublicKeyEntry)},
+				AllInstanceGroups: igs,
 				InstanceGroups:  igs,
 			},
 		},
 		BootstrapScriptBuilder: &model.BootstrapScriptBuilder{
 			KopsModelContext: &model.KopsModelContext{
 				IAMModelContext: iam.IAMModelContext{Cluster: cluster},
+				AllInstanceGroups: igs,
 				InstanceGroups:  igs,
 			},
 			Lifecycle: fi.LifecycleSync,

diff --git a/pkg/model/azuremodel/testing.go b/pkg/model/azuremodel/testing.go
@@ -32,6 +32,7 @@ func newTestAzureModelContext() *AzureModelContext {
 			IAMModelContext: iam.IAMModelContext{
 				Cluster: cluster,
 			},
+			AllInstanceGroups: []*kops.InstanceGroup{ig},
 			InstanceGroups: []*kops.InstanceGroup{ig},
 			SSHPublicKeys:  [][]byte{[]byte("ssh-rsa ...")},
 		},

diff --git a/pkg/model/bootstrapscript_test.go b/pkg/model/bootstrapscript_test.go
@@ -171,6 +171,7 @@ func TestBootstrapUserData(t *testing.T) {
 		bs := &BootstrapScriptBuilder{
 			KopsModelContext: &KopsModelContext{
 				IAMModelContext: iam.IAMModelContext{Cluster: cluster},
+				AllInstanceGroups:  []*kops.InstanceGroup{group},
 				InstanceGroups:  []*kops.InstanceGroup{group},
 			},
 			NodeUpConfigBuilder: &nodeupConfigBuilder{cluster: cluster},

diff --git a/pkg/model/components/etcdmanager/model_test.go b/pkg/model/components/etcdmanager/model_test.go
@@ -82,6 +82,7 @@ func LoadKopsModelContext(basedir string) (*model.KopsModelContext, error) {
 
 	kopsContext := &model.KopsModelContext{
 		IAMModelContext: iam.IAMModelContext{Cluster: spec.Cluster},
+		AllInstanceGroups:  spec.InstanceGroups,
 		InstanceGroups:  spec.InstanceGroups,
 	}
 

diff --git a/pkg/model/components/kubeapiserver/model_test.go b/pkg/model/components/kubeapiserver/model_test.go
@@ -75,6 +75,7 @@ func LoadKopsModelContext(basedir string) (*model.KopsModelContext, error) {
 
 	kopsContext := &model.KopsModelContext{
 		IAMModelContext: iam.IAMModelContext{Cluster: spec.Cluster},
+		AllInstanceGroups:  spec.InstanceGroups,
 		InstanceGroups:  spec.InstanceGroups,
 	}
 

diff --git a/pkg/model/components/kubescheduler/model_test.go b/pkg/model/components/kubescheduler/model_test.go
@@ -78,6 +78,7 @@ func LoadKopsModelContext(basedir string) (*model.KopsModelContext, error) {
 
 	kopsContext := &model.KopsModelContext{
 		IAMModelContext: iam.IAMModelContext{Cluster: spec.Cluster},
+		AllInstanceGroups:  spec.InstanceGroups,
 		InstanceGroups:  spec.InstanceGroups,
 	}
 

diff --git a/pkg/model/openstackmodel/servergroup_test.go b/pkg/model/openstackmodel/servergroup_test.go
@@ -1532,6 +1532,7 @@ func createBuilderForCluster(cluster *kops.Cluster, instanceGroups []*kops.Insta
 
 	modelContext := &model.KopsModelContext{
 		IAMModelContext: iam.IAMModelContext{Cluster: cluster},
+		AllInstanceGroups:  instanceGroups,
 		InstanceGroups:  instanceGroups,
 		SSHPublicKeys:   [][]byte{sshPublicKey},
 	}
@@ -1570,6 +1571,7 @@ func RunGoldenTest(t *testing.T, basedir string, testCase serverGroupModelBuilde
 	bootstrapScriptBuilder := &model.BootstrapScriptBuilder{
 		KopsModelContext: &model.KopsModelContext{
 			IAMModelContext: iam.IAMModelContext{Cluster: testCase.cluster},
+			AllInstanceGroups:  testCase.instanceGroups,
 			InstanceGroups:  testCase.instanceGroups,
 		},
 		NodeUpConfigBuilder: &nodeupConfigBuilder{},

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go
@@ -153,6 +153,8 @@ func runChannelBuilderTest(t *testing.T, key string, addonManifests []string) {
 		},
 	}
 
+	kopsModel.AllInstanceGroups = kopsModel.InstanceGroups
+
 	tf := &TemplateFunctions{
 		KopsModelContext: kopsModel,
 		cloud:            cloud,