Fixup Expected Test Data

aws · Feb 26, 2024 · 239f69d · 239f69d
1 parent 822ba11
commit 239f69d
Show file tree

Hide file tree

Showing 121 changed files with 250 additions and 0 deletions.
diff --git a/pkg/clustermanager/testdata/testClusterSpec.yaml b/pkg/clustermanager/testdata/testClusterSpec.yaml
@@ -54,6 +54,9 @@ spec:
     name: docker-test-control-plane
     namespace: default
   kubeadmConfigSpec:
+    clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
     clusterConfiguration:
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:

diff --git a/pkg/providers/cloudstack/controlplane_test.go b/pkg/providers/cloudstack/controlplane_test.go
@@ -307,6 +307,9 @@ func kubeadmControlPlane(opts ...func(*controlplanev1.KubeadmControlPlane)) *con
 			},
 			KubeadmConfigSpec: bootstrapv1.KubeadmConfigSpec{
 				ClusterConfiguration: &bootstrapv1.ClusterConfiguration{
+					FeatureGates: map[string]bool{
+						"EtcdLearnerMode": false,
+					},
 					ImageRepository: "public.ecr.aws/eks-distro/kubernetes",
 					Etcd: bootstrapv1.Etcd{
 						External: &bootstrapv1.ExternalEtcd{

diff --git a/pkg/providers/cloudstack/testdata/expected_cluster_api_server_cert_san_domain_name.yaml b/pkg/providers/cloudstack/testdata/expected_cluster_api_server_cert_san_domain_name.yaml
@@ -59,6 +59,8 @@ spec:
       name: test-control-plane-1
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         local:

diff --git a/pkg/providers/cloudstack/testdata/expected_cluster_api_server_cert_san_ip.yaml b/pkg/providers/cloudstack/testdata/expected_cluster_api_server_cert_san_ip.yaml
@@ -59,6 +59,8 @@ spec:
       name: test-control-plane-1
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         local:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_affinity_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_affinity_cp.yaml
@@ -63,6 +63,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_availability_zones_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_availability_zones_cp.yaml
@@ -83,6 +83,9 @@ spec:
       kind: CloudStackMachineTemplate
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
+    clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
     clusterConfiguration:
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_encryption_config_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_encryption_config_cp.yaml
@@ -59,6 +59,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         local:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_encryption_config_cp_1_29.yaml b/pkg/providers/cloudstack/testdata/expected_results_encryption_config_cp_1_29.yaml
@@ -59,6 +59,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         local:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_main_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_main_cp.yaml
@@ -63,6 +63,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_main_cp_kubernetes_version.yaml b/pkg/providers/cloudstack/testdata/expected_results_main_cp_kubernetes_version.yaml
@@ -63,6 +63,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_main_no_machinetemplate_update_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_main_no_machinetemplate_update_cp.yaml
@@ -63,6 +63,8 @@ spec:
       name: test-control-plane-template-original
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_main_node_labels_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_main_node_labels_cp.yaml
@@ -63,6 +63,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_main_with_taints_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_main_with_taints_cp.yaml
@@ -63,6 +63,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_minimal_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_minimal_cp.yaml
@@ -59,6 +59,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         local:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_minimal_proxy_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_minimal_proxy_cp.yaml
@@ -59,6 +59,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         local:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_mirror_config_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_mirror_config_cp.yaml
@@ -63,6 +63,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_cert_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_cert_cp.yaml
@@ -63,6 +63,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/...rs/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_and_cert_cp.yaml b/...rs/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_and_cert_cp.yaml
@@ -63,6 +63,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_mirror_config_with_insecure_skip_cp.yaml
@@ -63,6 +63,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/cloudstack/testdata/expected_results_resourceids_cp.yaml b/pkg/providers/cloudstack/testdata/expected_results_resourceids_cp.yaml
@@ -63,6 +63,8 @@ spec:
       name: test-control-plane-template-1234567890000
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/docker/controlplane_test.go b/pkg/providers/docker/controlplane_test.go
@@ -484,6 +484,9 @@ func kubeadmControlPlane(opts ...func(*controlplanev1.KubeadmControlPlane)) *con
 			},
 			KubeadmConfigSpec: bootstrapv1.KubeadmConfigSpec{
 				ClusterConfiguration: &bootstrapv1.ClusterConfiguration{
+					FeatureGates: map[string]bool{
+						"EtcdLearnerMode": false,
+					},
 					ImageRepository: "public.ecr.aws/eks-distro/kubernetes",
 					Etcd: bootstrapv1.Etcd{
 						External: &bootstrapv1.ExternalEtcd{

diff --git a/pkg/providers/docker/testdata/capd_valid_full_oidc_cp_expected.yaml b/pkg/providers/docker/testdata/capd_valid_full_oidc_cp_expected.yaml
@@ -63,6 +63,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/docker/testdata/capd_valid_minimal_oidc_cp_expected.yaml b/pkg/providers/docker/testdata/capd_valid_minimal_oidc_cp_expected.yaml
@@ -63,6 +63,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/docker/testdata/expected_cluster_api_server_cert_san_domain_name.yaml b/pkg/providers/docker/testdata/expected_cluster_api_server_cert_san_domain_name.yaml
@@ -58,6 +58,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         local:

diff --git a/pkg/providers/docker/testdata/expected_cluster_api_server_cert_san_ip.yaml b/pkg/providers/docker/testdata/expected_cluster_api_server_cert_san_ip.yaml
@@ -58,6 +58,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         local:

diff --git a/pkg/providers/docker/testdata/expected_results_cluster_docker_cp_single_node.yaml b/pkg/providers/docker/testdata/expected_results_cluster_docker_cp_single_node.yaml
@@ -58,6 +58,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         local:

diff --git a/pkg/providers/docker/testdata/expected_results_mirror_config_cp.yaml b/pkg/providers/docker/testdata/expected_results_mirror_config_cp.yaml
@@ -63,6 +63,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/docker/testdata/expected_results_mirror_with_auth_config_cp.yaml b/pkg/providers/docker/testdata/expected_results_mirror_with_auth_config_cp.yaml
@@ -63,6 +63,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/docker/testdata/expected_results_mirror_with_cert_config_cp.yaml b/pkg/providers/docker/testdata/expected_results_mirror_with_cert_config_cp.yaml
@@ -63,6 +63,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/docker/testdata/no_machinetemplate_update_cp_expected.yaml b/pkg/providers/docker/testdata/no_machinetemplate_update_cp_expected.yaml
@@ -58,6 +58,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: 
       etcd:
         local:

diff --git a/pkg/providers/docker/testdata/valid_deployment_cp_expected.yaml b/pkg/providers/docker/testdata/valid_deployment_cp_expected.yaml
@@ -63,6 +63,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/docker/testdata/valid_deployment_cp_expected_124onwards.yaml b/pkg/providers/docker/testdata/valid_deployment_cp_expected_124onwards.yaml
@@ -63,6 +63,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/docker/testdata/valid_deployment_cp_pod_iam_expected.yaml b/pkg/providers/docker/testdata/valid_deployment_cp_pod_iam_expected.yaml
@@ -63,6 +63,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/docker/testdata/valid_deployment_cp_stacked_etcd_expected.yaml b/pkg/providers/docker/testdata/valid_deployment_cp_stacked_etcd_expected.yaml
@@ -58,6 +58,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         local:

diff --git a/pkg/providers/docker/testdata/valid_deployment_cp_taints_expected.yaml b/pkg/providers/docker/testdata/valid_deployment_cp_taints_expected.yaml
@@ -63,6 +63,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/docker/testdata/valid_deployment_custom_cidrs_cp_expected.yaml b/pkg/providers/docker/testdata/valid_deployment_custom_cidrs_cp_expected.yaml
@@ -63,6 +63,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/docker/testdata/valid_deployment_node_labels_cp_expected.yaml b/pkg/providers/docker/testdata/valid_deployment_node_labels_cp_expected.yaml
@@ -63,6 +63,8 @@ spec:
       namespace: eksa-system
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: public.ecr.aws/eks-distro/kubernetes
       etcd:
         external:

diff --git a/pkg/providers/nutanix/config/cp-template.yaml b/pkg/providers/nutanix/config/cp-template.yaml
@@ -73,6 +73,8 @@ spec:
 {{- end }}
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: "{{.kubernetesRepository}}"
       apiServer:
         certSANs:

diff --git a/pkg/providers/nutanix/testdata/expected_cluster_api_additional_trust_bundle.yaml b/pkg/providers/nutanix/testdata/expected_cluster_api_additional_trust_bundle.yaml
@@ -78,6 +78,8 @@ spec:
       name: "<no value>"
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: "public.ecr.aws/eks-distro/kubernetes"
       apiServer:
         certSANs:

diff --git a/pkg/providers/nutanix/testdata/expected_cluster_api_server_cert_san_domain_name.yaml b/pkg/providers/nutanix/testdata/expected_cluster_api_server_cert_san_domain_name.yaml
@@ -54,6 +54,8 @@ spec:
       name: "<no value>"
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: "public.ecr.aws/eks-distro/kubernetes"
       apiServer:
         certSANs:

diff --git a/pkg/providers/nutanix/testdata/expected_cluster_api_server_cert_san_ip.yaml b/pkg/providers/nutanix/testdata/expected_cluster_api_server_cert_san_ip.yaml
@@ -54,6 +54,8 @@ spec:
       name: "<no value>"
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: "public.ecr.aws/eks-distro/kubernetes"
       apiServer:
         certSANs:

diff --git a/pkg/providers/nutanix/testdata/expected_results_additional_categories.yaml b/pkg/providers/nutanix/testdata/expected_results_additional_categories.yaml
@@ -54,6 +54,8 @@ spec:
       name: "<no value>"
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: "public.ecr.aws/eks-distro/kubernetes"
       apiServer:
         certSANs:

diff --git a/pkg/providers/nutanix/testdata/expected_results_etcd_encryption.yaml b/pkg/providers/nutanix/testdata/expected_results_etcd_encryption.yaml
@@ -54,6 +54,8 @@ spec:
       name: "<no value>"
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: "public.ecr.aws/eks-distro/kubernetes"
       apiServer:
         certSANs:

diff --git a/pkg/providers/nutanix/testdata/expected_results_etcd_encryption_1_29.yaml b/pkg/providers/nutanix/testdata/expected_results_etcd_encryption_1_29.yaml
@@ -54,6 +54,8 @@ spec:
       name: "<no value>"
   kubeadmConfigSpec:
     clusterConfiguration:
+      featureGates:
+        EtcdLearnerMode: false
       imageRepository: "public.ecr.aws/eks-distro/kubernetes"
       apiServer:
         certSANs: