Skip to content

Commit 22506a4

Browse files
snootansnootan
committed
Fixed eks acceptance testing related issue
Signed-off-by: Nootan Singh <snootan@vmware.com>
1 parent 7b21fe2 commit 22506a4

File tree

3 files changed

+19
-40
lines changed

3 files changed

+19
-40
lines changed

‎internal/resources/ekscluster/resource_ekscluster_test.go‎

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,10 @@ func TestAcceptanceForMkpClusterResource(t *testing.T) {
312312
),
313313
},
314314
{
315-
ResourceName: testhelper.EksClusterResourceName,
316-
ImportState: true,
317-
ImportStateVerify: true,
315+
ResourceName: testhelper.EksClusterResourceName,
316+
ImportState: true,
317+
ImportStateVerify: true,
318+
ImportStateVerifyIgnore: []string{waitForKubeconfig},
318319
},
319320
},
320321
})
@@ -418,7 +419,7 @@ func getMockEksClusterSpec(accountID string, templateID string) (eksmodel.Vmware
418419
return eksmodel.VmwareTanzuManageV1alpha1EksclusterSpec{
419420
ClusterGroupName: "default",
420421
Config: &eksmodel.VmwareTanzuManageV1alpha1EksclusterControlPlaneConfig{
421-
Version: "1.23",
422+
Version: "1.26",
422423
RoleArn: controlPlaneRoleARN,
423424
Tags: map[string]string{
424425
"tmc.cloud.vmware.com/tmc-managed": "true",
@@ -441,14 +442,9 @@ func getMockEksClusterSpec(accountID string, templateID string) (eksmodel.Vmware
441442
PublicAccessCidrs: []string{
442443
"0.0.0.0/0",
443444
},
444-
SecurityGroups: []string{
445-
"sg-0a6768722e9716768",
446-
},
445+
SecurityGroups: []string{"sg-0b77767aa25e20fec"},
447446
SubnetIds: []string{
448-
"subnet-0a184f6302af32a86",
449-
"subnet-0ed95d5c212ac62a1",
450-
"subnet-0526ecaecde5b1bf7",
451-
"subnet-06897e1063cc0cf4e",
447+
"subnet-0c285da60b373a4cc", "subnet-0be854d94fa197cb7", "subnet-04975d535cf761785", "subnet-0d50aa17c694457c9",
452448
},
453449
},
454450
},
@@ -460,12 +456,9 @@ func getMockEksClusterSpec(accountID string, templateID string) (eksmodel.Vmware
460456
Description: "tf nodepool description",
461457
},
462458
Spec: &eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolSpec{
463-
RoleArn: workerRoleArn,
464-
AmiType: "CUSTOM",
465-
AmiInfo: &eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolAmiInfo{
466-
AmiID: "ami-2qu8409oisdfj0qw",
467-
OverrideBootstrapCmd: "#!/bin/bash\n/etc/eks/bootstrap.sh tf-test-ami",
468-
},
459+
RoleArn: workerRoleArn,
460+
AmiType: "AL2_x86_64",
461+
AmiInfo: &eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolAmiInfo{},
469462
CapacityType: "ON_DEMAND",
470463
RootDiskSize: 40,
471464
Tags: map[string]string{
@@ -477,16 +470,7 @@ func getMockEksClusterSpec(accountID string, templateID string) (eksmodel.Vmware
477470
"testnplabelkey": "testnplabelvalue",
478471
},
479472
SubnetIds: []string{
480-
"subnet-0a184f6302af32a86",
481-
"subnet-0ed95d5c212ac62a1",
482-
"subnet-0526ecaecde5b1bf7",
483-
"subnet-06897e1063cc0cf4e",
484-
},
485-
RemoteAccess: &eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolRemoteAccess{
486-
SSHKey: "anshulc",
487-
SecurityGroups: []string{
488-
"sg-0a6768722e9716768",
489-
},
473+
"subnet-0c285da60b373a4cc", "subnet-0be854d94fa197cb7", "subnet-04975d535cf761785", "subnet-0d50aa17c694457c9",
490474
},
491475
ScalingConfig: &eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolScalingConfig{
492476
DesiredSize: 4,
@@ -501,6 +485,7 @@ func getMockEksClusterSpec(accountID string, templateID string) (eksmodel.Vmware
501485
"m3.large",
502486
},
503487
Taints: make([]*eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolTaint, 0),
488+
RemoteAccess: &eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolRemoteAccess{},
504489
LaunchTemplate: &eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolLaunchTemplate{},
505490
},
506491
},
@@ -520,15 +505,9 @@ func getMockEksClusterSpec(accountID string, templateID string) (eksmodel.Vmware
520505
"testnplabelkey": "testnplabelvalue",
521506
},
522507
SubnetIds: []string{
523-
"subnet-0a184f6302af32a86",
524-
"subnet-0ed95d5c212ac62a1",
525-
"subnet-0526ecaecde5b1bf7",
526-
"subnet-06897e1063cc0cf4e",
527-
},
528-
LaunchTemplate: &eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolLaunchTemplate{
529-
Name: "PLACE_HOLDER",
530-
Version: "PLACE_HOLDER",
508+
"subnet-0c285da60b373a4cc", "subnet-0be854d94fa197cb7", "subnet-04975d535cf761785", "subnet-0d50aa17c694457c9",
531509
},
510+
LaunchTemplate: &eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolLaunchTemplate{},
532511
ScalingConfig: &eksmodel.VmwareTanzuManageV1alpha1EksclusterNodepoolScalingConfig{
533512
DesiredSize: 4,
534513
MaxSize: 8,

‎internal/resources/testing/test_config.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ const testDefaultCreateEksClusterScript = `
3636
"0.0.0.0/0",
3737
]
3838
security_groups = [ // Forces new
39-
"sg-09247a89b01962bd9",
39+
"sg-0b77767aa25e20fec",
4040
]
4141
subnet_ids = [ // Forces new
42-
"subnet-0e3bcd8e3c06a4bf0", "subnet-06427cefa730aeae7", "subnet-07c17b758e92356f6", "subnet-0a081ddc6ff1070d0"
42+
"subnet-0c285da60b373a4cc", "subnet-0be854d94fa197cb7", "subnet-04975d535cf761785", "subnet-0d50aa17c694457c9"
4343
]
4444
}
4545
}
@@ -58,7 +58,7 @@ const testDefaultCreateEksClusterScript = `
5858
tags = { "testnptag" : "testnptagvalue", "newtesttag": "testingtagvalue"}
5959
node_labels = { "testnplabelkey" : "testnplabelvalue" }
6060
subnet_ids = [ // Required, forces new
61-
"subnet-0e3bcd8e3c06a4bf0", "subnet-06427cefa730aeae7", "subnet-07c17b758e92356f6", "subnet-0a081ddc6ff1070d0"
61+
"subnet-0c285da60b373a4cc", "subnet-0be854d94fa197cb7", "subnet-04975d535cf761785", "subnet-0d50aa17c694457c9"
6262
]
6363
scaling_config {
6464
desired_size = 4
@@ -86,7 +86,7 @@ const testDefaultCreateEksClusterScript = `
8686
tags = { "testnptag" : "testnptagvalue", "newtesttag": "testingtagvalue"}
8787
node_labels = { "testnplabelkey" : "testnplabelvalue" }
8888
subnet_ids = [ // Required, forces new
89-
"subnet-0e3bcd8e3c06a4bf0", "subnet-06427cefa730aeae7", "subnet-07c17b758e92356f6", "subnet-0a081ddc6ff1070d0"
89+
"subnet-0c285da60b373a4cc", "subnet-0be854d94fa197cb7", "subnet-04975d535cf761785", "subnet-0d50aa17c694457c9"
9090
]
9191
scaling_config {
9292
desired_size = 4

‎internal/resources/testing/test_helper.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func TestGetDefaultEksAcceptanceConfig() *TestAcceptanceConfig {
202202
AWSAccountNumber: "919197287370",
203203
Region: "us-west-2",
204204
ClusterGroupName: "default",
205-
KubernetesVersion: "1.23",
205+
KubernetesVersion: "1.26",
206206
CredentialName: "PLACE_HOLDER",
207207
CloudFormationTemplateID: "PLACE_HOLDER",
208208
}

0 commit comments

Comments
 (0)