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

tests: set AllInstanceGroups alongside InstanceGroups

This commit is contained in:
justinsb 2024-11-09 11:58:19 -05:00
parent 1683894999
commit b4306a390c
8 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/model/awsmodel/autoscalinggroup_test.go
View File

@ -65,9 +65,10 @@ func TestRootVolumeOptimizationFlag(t *testing.T) {
b := AutoscalingGroupModelBuilder{ b := AutoscalingGroupModelBuilder{
AWSModelContext: &AWSModelContext{ AWSModelContext: &AWSModelContext{
KopsModelContext: &model.KopsModelContext{ KopsModelContext: &model.KopsModelContext{
IAMModelContext: iam.IAMModelContext{Cluster: cluster}, IAMModelContext: iam.IAMModelContext{Cluster: cluster},
SSHPublicKeys: k, SSHPublicKeys: k,
InstanceGroups: igs, AllInstanceGroups: igs,
InstanceGroups: igs,
}, },
}, },
BootstrapScriptBuilder: &model.BootstrapScriptBuilder{ BootstrapScriptBuilder: &model.BootstrapScriptBuilder{
@ -177,15 +178,17 @@ func TestAPIServerAdditionalSecurityGroupsWithNLB(t *testing.T) {
b := AutoscalingGroupModelBuilder{ b := AutoscalingGroupModelBuilder{
AWSModelContext: &AWSModelContext{ AWSModelContext: &AWSModelContext{
KopsModelContext: &model.KopsModelContext{ KopsModelContext: &model.KopsModelContext{
IAMModelContext: iam.IAMModelContext{Cluster: cluster}, IAMModelContext: iam.IAMModelContext{Cluster: cluster},
SSHPublicKeys: [][]byte{[]byte(sshPublicKeyEntry)}, SSHPublicKeys: [][]byte{[]byte(sshPublicKeyEntry)},
InstanceGroups: igs, AllInstanceGroups: igs,
InstanceGroups: igs,
}, },
}, },
BootstrapScriptBuilder: &model.BootstrapScriptBuilder{ BootstrapScriptBuilder: &model.BootstrapScriptBuilder{
KopsModelContext: &model.KopsModelContext{ KopsModelContext: &model.KopsModelContext{
IAMModelContext: iam.IAMModelContext{Cluster: cluster}, IAMModelContext: iam.IAMModelContext{Cluster: cluster},
InstanceGroups: igs, AllInstanceGroups: igs,
InstanceGroups: igs,
}, },
Lifecycle: fi.LifecycleSync, Lifecycle: fi.LifecycleSync,
}, },

5
pkg/model/azuremodel/testing.go
View File

@ -32,8 +32,9 @@ func newTestAzureModelContext() *AzureModelContext {
IAMModelContext: iam.IAMModelContext{ IAMModelContext: iam.IAMModelContext{
Cluster: cluster, Cluster: cluster,
}, },
InstanceGroups: []*kops.InstanceGroup{ig}, AllInstanceGroups: []*kops.InstanceGroup{ig},
SSHPublicKeys: [][]byte{[]byte("ssh-rsa ...")}, InstanceGroups: []*kops.InstanceGroup{ig},
SSHPublicKeys: [][]byte{[]byte("ssh-rsa ...")},
}, },
} }
} }

5
pkg/model/bootstrapscript_test.go
View File

@ -170,8 +170,9 @@ func TestBootstrapUserData(t *testing.T) {
bs := &BootstrapScriptBuilder{ bs := &BootstrapScriptBuilder{
KopsModelContext: &KopsModelContext{ KopsModelContext: &KopsModelContext{
IAMModelContext: iam.IAMModelContext{Cluster: cluster}, IAMModelContext: iam.IAMModelContext{Cluster: cluster},
InstanceGroups: []*kops.InstanceGroup{group}, AllInstanceGroups: []*kops.InstanceGroup{group},
InstanceGroups: []*kops.InstanceGroup{group},
}, },
NodeUpConfigBuilder: &nodeupConfigBuilder{cluster: cluster}, NodeUpConfigBuilder: &nodeupConfigBuilder{cluster: cluster},
NodeUpAssets: map[architectures.Architecture]*assets.MirroredAsset{ NodeUpAssets: map[architectures.Architecture]*assets.MirroredAsset{

5
pkg/model/components/etcdmanager/model_test.go
View File

@ -81,8 +81,9 @@ func LoadKopsModelContext(basedir string) (*model.KopsModelContext, error) {
} }
kopsContext := &model.KopsModelContext{ kopsContext := &model.KopsModelContext{
IAMModelContext: iam.IAMModelContext{Cluster: spec.Cluster}, IAMModelContext: iam.IAMModelContext{Cluster: spec.Cluster},
InstanceGroups: spec.InstanceGroups, AllInstanceGroups: spec.InstanceGroups,
InstanceGroups: spec.InstanceGroups,
} }
return kopsContext, nil return kopsContext, nil

5
pkg/model/components/kubeapiserver/model_test.go
View File

@ -74,8 +74,9 @@ func LoadKopsModelContext(basedir string) (*model.KopsModelContext, error) {
} }
kopsContext := &model.KopsModelContext{ kopsContext := &model.KopsModelContext{
IAMModelContext: iam.IAMModelContext{Cluster: spec.Cluster}, IAMModelContext: iam.IAMModelContext{Cluster: spec.Cluster},
InstanceGroups: spec.InstanceGroups, AllInstanceGroups: spec.InstanceGroups,
InstanceGroups: spec.InstanceGroups,
} }
return kopsContext, nil return kopsContext, nil

5
pkg/model/components/kubescheduler/model_test.go
View File

@ -77,8 +77,9 @@ func LoadKopsModelContext(basedir string) (*model.KopsModelContext, error) {
} }
kopsContext := &model.KopsModelContext{ kopsContext := &model.KopsModelContext{
IAMModelContext: iam.IAMModelContext{Cluster: spec.Cluster}, IAMModelContext: iam.IAMModelContext{Cluster: spec.Cluster},
InstanceGroups: spec.InstanceGroups, AllInstanceGroups: spec.InstanceGroups,
InstanceGroups: spec.InstanceGroups,
} }
for _, u := range spec.AdditionalObjects { for _, u := range spec.AdditionalObjects {

12
pkg/model/openstackmodel/servergroup_test.go
View File

@ -1531,9 +1531,10 @@ func createBuilderForCluster(cluster *kops.Cluster, instanceGroups []*kops.Insta
sshPublicKey := []byte("ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDF2sghZsClUBXJB4mBMIw8rb0hJWjg1Vz4eUeXwYmTdi92Gf1zNc5xISSip9Y+PWX/jJokPB7tgPnMD/2JOAKhG1bi4ZqB15pYRmbbBekVpM4o4E0dx+czbqjiAm6wlccTrINK5LYenbucAAQt19eH+D0gJwzYUK9SYz1hWnlGS+qurt2bz7rrsG73lN8E2eiNvGtIXqv3GabW/Hea3acOBgCUJQWUDTRu0OmmwxzKbFN/UpNKeRaHlCqwZWjVAsmqA8TX8LIocq7Np7MmIBwt7EpEeZJxThcmC8DEJs9ClAjD+jlLIvMPXKC3JWCPgwCLGxHjy7ckSGFCSzbyPduh") sshPublicKey := []byte("ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDF2sghZsClUBXJB4mBMIw8rb0hJWjg1Vz4eUeXwYmTdi92Gf1zNc5xISSip9Y+PWX/jJokPB7tgPnMD/2JOAKhG1bi4ZqB15pYRmbbBekVpM4o4E0dx+czbqjiAm6wlccTrINK5LYenbucAAQt19eH+D0gJwzYUK9SYz1hWnlGS+qurt2bz7rrsG73lN8E2eiNvGtIXqv3GabW/Hea3acOBgCUJQWUDTRu0OmmwxzKbFN/UpNKeRaHlCqwZWjVAsmqA8TX8LIocq7Np7MmIBwt7EpEeZJxThcmC8DEJs9ClAjD+jlLIvMPXKC3JWCPgwCLGxHjy7ckSGFCSzbyPduh")
modelContext := &model.KopsModelContext{ modelContext := &model.KopsModelContext{
IAMModelContext: iam.IAMModelContext{Cluster: cluster}, IAMModelContext: iam.IAMModelContext{Cluster: cluster},
InstanceGroups: instanceGroups, AllInstanceGroups: instanceGroups,
SSHPublicKeys: [][]byte{sshPublicKey}, InstanceGroups: instanceGroups,
SSHPublicKeys: [][]byte{sshPublicKey},
} }
openstackModelContext := &OpenstackModelContext{ openstackModelContext := &OpenstackModelContext{
KopsModelContext: modelContext, KopsModelContext: modelContext,
@ -1569,8 +1570,9 @@ func RunGoldenTest(t *testing.T, basedir string, testCase serverGroupModelBuilde
clusterLifecycle := fi.LifecycleSync clusterLifecycle := fi.LifecycleSync
bootstrapScriptBuilder := &model.BootstrapScriptBuilder{ bootstrapScriptBuilder := &model.BootstrapScriptBuilder{
KopsModelContext: &model.KopsModelContext{ KopsModelContext: &model.KopsModelContext{
IAMModelContext: iam.IAMModelContext{Cluster: testCase.cluster}, IAMModelContext: iam.IAMModelContext{Cluster: testCase.cluster},
InstanceGroups: testCase.instanceGroups, AllInstanceGroups: testCase.instanceGroups,
InstanceGroups: testCase.instanceGroups,
}, },
NodeUpConfigBuilder: &nodeupConfigBuilder{}, NodeUpConfigBuilder: &nodeupConfigBuilder{},
NodeUpAssets: map[architectures.Architecture]*assets.MirroredAsset{ NodeUpAssets: map[architectures.Architecture]*assets.MirroredAsset{

2
upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go
View File

@ -153,6 +153,8 @@ func runChannelBuilderTest(t *testing.T, key string, addonManifests []string) {
}, },
} }
kopsModel.AllInstanceGroups = kopsModel.InstanceGroups
tf := &TemplateFunctions{ tf := &TemplateFunctions{
KopsModelContext: kopsModel, KopsModelContext: kopsModel,
cloud: cloud, cloud: cloud,