@@ -84,26 +84,26 @@ func TestDefaultingWebhook(t *testing.T) {
84
84
resourceName : "cluster1" ,
85
85
resourceNS : "default" ,
86
86
expectHash : false ,
87
- expectSpec : AWSManagedControlPlaneSpec {AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
88
- EKSClusterName : "default_cluster1" , Bastion : defaultTestBastion , IdentityRef : defaultIdentityRef , NetworkSpec : defaultNetworkSpec , TokenMethod : & EKSTokenMethodIAMAuthenticator ,
87
+ expectSpec : AWSManagedControlPlaneSpec {EKSClusterName : "default_cluster1" , AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
88
+ Bastion : defaultTestBastion , IdentityRef : defaultIdentityRef , NetworkSpec : defaultNetworkSpec , TokenMethod : & EKSTokenMethodIAMAuthenticator ,
89
89
}},
90
90
},
91
91
{
92
92
name : "less than 100 chars, dot in name" ,
93
93
resourceName : "team1.cluster1" ,
94
94
resourceNS : "default" ,
95
95
expectHash : false ,
96
- expectSpec : AWSManagedControlPlaneSpec {AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
97
- EKSClusterName : "default_team1_cluster1" , Bastion : defaultTestBastion , IdentityRef : defaultIdentityRef , NetworkSpec : defaultNetworkSpec , TokenMethod : & EKSTokenMethodIAMAuthenticator ,
96
+ expectSpec : AWSManagedControlPlaneSpec {EKSClusterName : "default_team1_cluster1" , AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
97
+ Bastion : defaultTestBastion , IdentityRef : defaultIdentityRef , NetworkSpec : defaultNetworkSpec , TokenMethod : & EKSTokenMethodIAMAuthenticator ,
98
98
}},
99
99
},
100
100
{
101
101
name : "more than 100 chars" ,
102
102
resourceName : "abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde" ,
103
103
resourceNS : "default" ,
104
104
expectHash : true ,
105
- expectSpec : AWSManagedControlPlaneSpec {AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
106
- EKSClusterName : "capi_" , Bastion : defaultTestBastion , IdentityRef : defaultIdentityRef , NetworkSpec : defaultNetworkSpec , TokenMethod : & EKSTokenMethodIAMAuthenticator ,
105
+ expectSpec : AWSManagedControlPlaneSpec {EKSClusterName : "capi_" , AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
106
+ Bastion : defaultTestBastion , IdentityRef : defaultIdentityRef , NetworkSpec : defaultNetworkSpec , TokenMethod : & EKSTokenMethodIAMAuthenticator ,
107
107
}},
108
108
},
109
109
{
@@ -112,8 +112,8 @@ func TestDefaultingWebhook(t *testing.T) {
112
112
resourceNS : "default" ,
113
113
expectHash : false ,
114
114
spec : AWSManagedControlPlaneSpec {AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {Version : & vV1_17_1 }},
115
- expectSpec : AWSManagedControlPlaneSpec {AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
116
- EKSClusterName : "default_cluster1" , Bastion : defaultTestBastion , Version : & vV1_17_1 , IdentityRef : defaultIdentityRef , NetworkSpec : defaultNetworkSpec , TokenMethod : & EKSTokenMethodIAMAuthenticator ,
115
+ expectSpec : AWSManagedControlPlaneSpec {EKSClusterName : "default_cluster1" , AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
116
+ Bastion : defaultTestBastion , Version : & vV1_17_1 , IdentityRef : defaultIdentityRef , NetworkSpec : defaultNetworkSpec , TokenMethod : & EKSTokenMethodIAMAuthenticator ,
117
117
}},
118
118
},
119
119
{
@@ -122,22 +122,22 @@ func TestDefaultingWebhook(t *testing.T) {
122
122
resourceNS : "default" ,
123
123
expectHash : false ,
124
124
spec : AWSManagedControlPlaneSpec {AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {Bastion : infrav1.Bastion {AllowedCIDRBlocks : []string {"100.100.100.100/0" }}}},
125
- expectSpec : AWSManagedControlPlaneSpec {AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec { EKSClusterName : "default_cluster1" , IdentityRef : defaultIdentityRef , Bastion : infrav1.Bastion {AllowedCIDRBlocks : []string {"100.100.100.100/0" }}, NetworkSpec : defaultNetworkSpec , TokenMethod : & EKSTokenMethodIAMAuthenticator }},
125
+ expectSpec : AWSManagedControlPlaneSpec {EKSClusterName : "default_cluster1" , AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec { IdentityRef : defaultIdentityRef , Bastion : infrav1.Bastion {AllowedCIDRBlocks : []string {"100.100.100.100/0" }}, NetworkSpec : defaultNetworkSpec , TokenMethod : & EKSTokenMethodIAMAuthenticator }},
126
126
},
127
127
{
128
128
name : "with CNI on network" ,
129
129
resourceName : "cluster1" ,
130
130
resourceNS : "default" ,
131
131
expectHash : false ,
132
132
spec : AWSManagedControlPlaneSpec {AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {NetworkSpec : infrav1.NetworkSpec {CNI : & infrav1.CNISpec {}}}},
133
- expectSpec : AWSManagedControlPlaneSpec {AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec { EKSClusterName : "default_cluster1" , IdentityRef : defaultIdentityRef , Bastion : defaultTestBastion , NetworkSpec : infrav1.NetworkSpec {CNI : & infrav1.CNISpec {}, VPC : defaultVPCSpec }, TokenMethod : & EKSTokenMethodIAMAuthenticator }},
133
+ expectSpec : AWSManagedControlPlaneSpec {EKSClusterName : "default_cluster1" , AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec { IdentityRef : defaultIdentityRef , Bastion : defaultTestBastion , NetworkSpec : infrav1.NetworkSpec {CNI : & infrav1.CNISpec {}, VPC : defaultVPCSpec }, TokenMethod : & EKSTokenMethodIAMAuthenticator }},
134
134
},
135
135
{
136
136
name : "secondary CIDR" ,
137
137
resourceName : "cluster1" ,
138
138
resourceNS : "default" ,
139
139
expectHash : false ,
140
- expectSpec : AWSManagedControlPlaneSpec {AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec { EKSClusterName : "default_cluster1" , IdentityRef : defaultIdentityRef , Bastion : defaultTestBastion , NetworkSpec : defaultNetworkSpec , SecondaryCidrBlock : nil , TokenMethod : & EKSTokenMethodIAMAuthenticator }},
140
+ expectSpec : AWSManagedControlPlaneSpec {EKSClusterName : "default_cluster1" , AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec { IdentityRef : defaultIdentityRef , Bastion : defaultTestBastion , NetworkSpec : defaultNetworkSpec , SecondaryCidrBlock : nil , TokenMethod : & EKSTokenMethodIAMAuthenticator }},
141
141
},
142
142
}
143
143
@@ -331,8 +331,8 @@ func TestWebhookCreate(t *testing.T) {
331
331
Namespace : "default" ,
332
332
},
333
333
Spec : AWSManagedControlPlaneSpec {
334
+ EKSClusterName : tc .eksClusterName ,
334
335
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
335
- EKSClusterName : tc .eksClusterName ,
336
336
KubeProxy : tc .kubeProxy ,
337
337
AdditionalTags : tc .additionalTags ,
338
338
VpcCni : tc .vpcCNI ,
@@ -493,11 +493,11 @@ func TestWebhookCreateIPv6Details(t *testing.T) {
493
493
Namespace : "default" ,
494
494
},
495
495
Spec : AWSManagedControlPlaneSpec {
496
+ EKSClusterName : "test-cluster" ,
496
497
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
497
- EKSClusterName : "test-cluster" ,
498
- Addons : tc .addons ,
499
- NetworkSpec : tc .networkSpec ,
500
- Version : aws .String (tc .kubeVersion ),
498
+ Addons : tc .addons ,
499
+ NetworkSpec : tc .networkSpec ,
500
+ Version : aws .String (tc .kubeVersion ),
501
501
},
502
502
},
503
503
}
@@ -526,109 +526,113 @@ func TestWebhookUpdate(t *testing.T) {
526
526
{
527
527
name : "ekscluster specified, same cluster names" ,
528
528
oldClusterSpec : AWSManagedControlPlaneSpec {
529
- AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {EKSClusterName : "default_cluster1" },
529
+ EKSClusterName : "default_cluster1" ,
530
+ AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {},
530
531
},
531
532
newClusterSpec : AWSManagedControlPlaneSpec {
532
- AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {EKSClusterName : "default_cluster1" },
533
+ EKSClusterName : "default_cluster1" ,
534
+ AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {},
533
535
},
534
536
expectError : false ,
535
537
},
536
538
{
537
539
name : "ekscluster specified, different cluster names" ,
538
540
oldClusterSpec : AWSManagedControlPlaneSpec {
539
- AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {EKSClusterName : "default_cluster1" },
541
+ EKSClusterName : "default_cluster1" ,
542
+ AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {},
540
543
},
541
544
newClusterSpec : AWSManagedControlPlaneSpec {
542
- AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {EKSClusterName : "default_cluster2" },
545
+ EKSClusterName : "default_cluster2" ,
546
+ AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {},
543
547
},
544
548
expectError : true ,
545
549
},
546
550
{
547
551
name : "old ekscluster specified, no new cluster name" ,
548
552
oldClusterSpec : AWSManagedControlPlaneSpec {
549
- AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {EKSClusterName : "default_cluster1" },
553
+ EKSClusterName : "default_cluster1" ,
554
+ AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {},
550
555
},
551
556
newClusterSpec : AWSManagedControlPlaneSpec {
552
- AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {EKSClusterName : "" },
557
+ EKSClusterName : "" ,
558
+ AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {},
553
559
},
554
560
expectError : true ,
555
561
},
556
562
{
557
563
name : "older version" ,
558
564
oldClusterSpec : AWSManagedControlPlaneSpec {
565
+ EKSClusterName : "default_cluster1" ,
559
566
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
560
- EKSClusterName : "default_cluster1" ,
561
- Version : & vV1_17 ,
567
+ Version : & vV1_17 ,
562
568
},
563
569
},
564
570
newClusterSpec : AWSManagedControlPlaneSpec {
571
+ EKSClusterName : "default_cluster1" ,
565
572
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
566
- EKSClusterName : "default_cluster1" ,
567
- Version : & vV1_16 ,
573
+ Version : & vV1_16 ,
568
574
},
569
575
},
570
576
expectError : true ,
571
577
},
572
578
{
573
579
name : "same version" ,
574
580
oldClusterSpec : AWSManagedControlPlaneSpec {
581
+ EKSClusterName : "default_cluster1" ,
575
582
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
576
- EKSClusterName : "default_cluster1" ,
577
- Version : & vV1_17 ,
583
+ Version : & vV1_17 ,
578
584
},
579
585
},
580
586
newClusterSpec : AWSManagedControlPlaneSpec {
587
+ EKSClusterName : "default_cluster1" ,
581
588
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
582
- EKSClusterName : "default_cluster1" ,
583
- Version : & vV1_17 ,
589
+ Version : & vV1_17 ,
584
590
},
585
591
},
586
592
expectError : false ,
587
593
},
588
594
{
589
595
name : "newer version" ,
590
596
oldClusterSpec : AWSManagedControlPlaneSpec {
597
+ EKSClusterName : "default_cluster1" ,
591
598
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
592
- EKSClusterName : "default_cluster1" ,
593
- Version : & vV1_16 ,
599
+ Version : & vV1_16 ,
594
600
},
595
601
},
596
602
newClusterSpec : AWSManagedControlPlaneSpec {
603
+ EKSClusterName : "default_cluster1" ,
597
604
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
598
- EKSClusterName : "default_cluster1" ,
599
- Version : & vV1_17 ,
605
+ Version : & vV1_17 ,
600
606
},
601
607
},
602
608
expectError : false ,
603
609
},
604
610
{
605
611
name : "change in encryption config to nil" ,
606
612
oldClusterSpec : AWSManagedControlPlaneSpec {
613
+ EKSClusterName : "default_cluster1" ,
607
614
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
608
- EKSClusterName : "default_cluster1" ,
609
615
EncryptionConfig : & EncryptionConfig {
610
616
Provider : pointer .String ("provider" ),
611
617
Resources : []* string {pointer .String ("foo" ), pointer .String ("bar" )},
612
618
},
613
619
},
614
620
},
615
621
newClusterSpec : AWSManagedControlPlaneSpec {
616
- AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
617
- EKSClusterName : "default_cluster1" ,
618
- },
622
+ EKSClusterName : "default_cluster1" ,
623
+ AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {},
619
624
},
620
625
expectError : true ,
621
626
},
622
627
{
623
628
name : "change in encryption config from nil to valid encryption-config" ,
624
629
oldClusterSpec : AWSManagedControlPlaneSpec {
625
- AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
626
- EKSClusterName : "default_cluster1" ,
627
- },
630
+ EKSClusterName : "default_cluster1" ,
631
+ AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {},
628
632
},
629
633
newClusterSpec : AWSManagedControlPlaneSpec {
634
+ EKSClusterName : "default_cluster1" ,
630
635
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
631
- EKSClusterName : "default_cluster1" ,
632
636
EncryptionConfig : & EncryptionConfig {
633
637
Provider : pointer .String ("provider" ),
634
638
Resources : []* string {pointer .String ("foo" ), pointer .String ("bar" )},
@@ -640,17 +644,17 @@ func TestWebhookUpdate(t *testing.T) {
640
644
{
641
645
name : "change in provider of encryption config" ,
642
646
oldClusterSpec : AWSManagedControlPlaneSpec {
647
+ EKSClusterName : "default_cluster1" ,
643
648
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
644
- EKSClusterName : "default_cluster1" ,
645
649
EncryptionConfig : & EncryptionConfig {
646
650
Provider : pointer .String ("provider" ),
647
651
Resources : []* string {pointer .String ("foo" ), pointer .String ("bar" )},
648
652
},
649
653
},
650
654
},
651
655
newClusterSpec : AWSManagedControlPlaneSpec {
656
+ EKSClusterName : "default_cluster1" ,
652
657
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
653
- EKSClusterName : "default_cluster1" ,
654
658
EncryptionConfig : & EncryptionConfig {
655
659
Provider : pointer .String ("new-provider" ),
656
660
Resources : []* string {pointer .String ("foo" ), pointer .String ("bar" )},
@@ -662,16 +666,16 @@ func TestWebhookUpdate(t *testing.T) {
662
666
{
663
667
name : "no change in provider of encryption config" ,
664
668
oldClusterSpec : AWSManagedControlPlaneSpec {
669
+ EKSClusterName : "default_cluster1" ,
665
670
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
666
- EKSClusterName : "default_cluster1" ,
667
671
EncryptionConfig : & EncryptionConfig {
668
672
Provider : pointer .String ("provider" ),
669
673
},
670
674
},
671
675
},
672
676
newClusterSpec : AWSManagedControlPlaneSpec {
677
+ EKSClusterName : "default_cluster1" ,
673
678
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
674
- EKSClusterName : "default_cluster1" ,
675
679
EncryptionConfig : & EncryptionConfig {
676
680
Provider : pointer .String ("provider" ),
677
681
},
@@ -682,13 +686,12 @@ func TestWebhookUpdate(t *testing.T) {
682
686
{
683
687
name : "ekscluster specified, same name, invalid tags" ,
684
688
oldClusterSpec : AWSManagedControlPlaneSpec {
685
- AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
686
- EKSClusterName : "default_cluster1" ,
687
- },
689
+ EKSClusterName : "default_cluster1" ,
690
+ AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {},
688
691
},
689
692
newClusterSpec : AWSManagedControlPlaneSpec {
693
+ EKSClusterName : "default_cluster1" ,
690
694
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
691
- EKSClusterName : "default_cluster1" ,
692
695
AdditionalTags : infrav1.Tags {
693
696
"key-1" : "value-1" ,
694
697
"" : "value-2" ,
@@ -702,17 +705,17 @@ func TestWebhookUpdate(t *testing.T) {
702
705
{
703
706
name : "changing ipv6 enabled is not allowed after it has been set - false, true" ,
704
707
oldClusterSpec : AWSManagedControlPlaneSpec {
708
+ EKSClusterName : "default_cluster1" ,
705
709
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
706
- EKSClusterName : "default_cluster1" ,
707
710
NetworkSpec : infrav1.NetworkSpec {
708
711
VPC : infrav1.VPCSpec {},
709
712
},
710
713
Version : pointer .String ("1.22" ),
711
714
},
712
715
},
713
716
newClusterSpec : AWSManagedControlPlaneSpec {
717
+ EKSClusterName : "default_cluster1" ,
714
718
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
715
- EKSClusterName : "default_cluster1" ,
716
719
NetworkSpec : infrav1.NetworkSpec {
717
720
VPC : infrav1.VPCSpec {
718
721
IPv6 : & infrav1.IPv6 {},
@@ -725,8 +728,8 @@ func TestWebhookUpdate(t *testing.T) {
725
728
{
726
729
name : "changing ipv6 enabled is not allowed after it has been set - true, false" ,
727
730
oldClusterSpec : AWSManagedControlPlaneSpec {
731
+ EKSClusterName : "default_cluster1" ,
728
732
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
729
- EKSClusterName : "default_cluster1" ,
730
733
NetworkSpec : infrav1.NetworkSpec {
731
734
VPC : infrav1.VPCSpec {
732
735
IPv6 : & infrav1.IPv6 {},
@@ -742,8 +745,8 @@ func TestWebhookUpdate(t *testing.T) {
742
745
},
743
746
},
744
747
newClusterSpec : AWSManagedControlPlaneSpec {
748
+ EKSClusterName : "default_cluster1" ,
745
749
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
746
- EKSClusterName : "default_cluster1" ,
747
750
NetworkSpec : infrav1.NetworkSpec {
748
751
VPC : infrav1.VPCSpec {},
749
752
},
@@ -827,9 +830,8 @@ func TestValidatingWebhookCreateSecondaryCidr(t *testing.T) {
827
830
828
831
mcp := & AWSManagedControlPlane {
829
832
Spec : AWSManagedControlPlaneSpec {
830
- AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
831
- EKSClusterName : "default_cluster1" ,
832
- },
833
+ EKSClusterName : "default_cluster1" ,
834
+ AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {},
833
835
},
834
836
}
835
837
if tc .cidrRange != "" {
@@ -897,16 +899,16 @@ func TestValidatingWebhookUpdateSecondaryCidr(t *testing.T) {
897
899
898
900
newMCP := & AWSManagedControlPlane {
899
901
Spec : AWSManagedControlPlaneSpec {
902
+ EKSClusterName : "default_cluster1" ,
900
903
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
901
- EKSClusterName : "default_cluster1" ,
902
904
SecondaryCidrBlock : aws .String (tc .cidrRange ),
903
905
},
904
906
},
905
907
}
906
908
oldMCP := & AWSManagedControlPlane {
907
909
Spec : AWSManagedControlPlaneSpec {
910
+ EKSClusterName : "default_cluster1" ,
908
911
AWSManagedControlPlaneClassSpec : AWSManagedControlPlaneClassSpec {
909
- EKSClusterName : "default_cluster1" ,
910
912
SecondaryCidrBlock : nil ,
911
913
},
912
914
},
0 commit comments