From c3e1baa447fcef148444e1e07ce67b2d06e593b7 Mon Sep 17 00:00:00 2001 From: Saurabh Parekh Date: Thu, 29 Feb 2024 11:36:16 -0800 Subject: [PATCH] Remove ServiceLoadBalancerClass feature gate (#7711) --- pkg/clusterapi/extraargs.go | 11 ------ pkg/clusterapi/extraargs_test.go | 36 ------------------- pkg/providers/tinkerbell/controlplane_test.go | 2 -- pkg/providers/tinkerbell/template.go | 5 --- ...rbell_api_server_cert_san_domain_name.yaml | 1 - ...ter_tinkerbell_api_server_cert_san_ip.yaml | 1 - ...s_bottlerocket_cert_bundles_config_cp.yaml | 1 - ...results_bottlerocket_kernel_config_cp.yaml | 1 - ...ed_results_bottlerocket_ntp_config_cp.yaml | 1 - ...sults_bottlerocket_settings_config_cp.yaml | 1 - ...rocket_upgrade_cert_bundles_config_cp.yaml | 1 - ...ttlerocket_cp_minimal_registry_mirror.yaml | 1 - ...lerocket_cp_registry_mirror_with_auth.yaml | 1 - ...lerocket_cp_registry_mirror_with_cert.yaml | 1 - ..._results_cluster_tinkerbell_cp_awsiam.yaml | 1 - ...s_cluster_tinkerbell_cp_external_etcd.yaml | 1 - ...sults_cluster_tinkerbell_cp_full_oidc.yaml | 1 - ...ts_cluster_tinkerbell_cp_minimal_oidc.yaml | 1 - ...tinkerbell_cp_minimal_registry_mirror.yaml | 1 - ...lts_cluster_tinkerbell_cp_node_labels.yaml | 1 - ...lts_cluster_tinkerbell_cp_node_taints.yaml | 1 - ...d_results_cluster_tinkerbell_cp_proxy.yaml | 1 - ...nkerbell_cp_registry_mirror_with_auth.yaml | 1 - ...nkerbell_cp_registry_mirror_with_cert.yaml | 1 - ...lts_cluster_tinkerbell_cp_single_node.yaml | 1 - ...er_tinkerbell_cp_single_node_in_place.yaml | 1 - ...ter_tinkerbell_cp_single_node_skip_lb.yaml | 1 - ...ts_cluster_tinkerbell_cp_stacked_etcd.yaml | 1 - ...s_cluster_tinkerbell_disable_kube_vip.yaml | 1 - ...s_cluster_tinkerbell_missing_ssh_keys.yaml | 1 - ...er_tinkerbell_upgrade_registry_mirror.yaml | 1 - .../expected_results_cp_template.yaml | 1 - ...ted_results_tinkerbell_pod_iam_config.yaml | 1 - ...expected_results_ubuntu_ntp_config_cp.yaml | 1 - 34 files changed, 84 deletions(-) diff --git a/pkg/clusterapi/extraargs.go b/pkg/clusterapi/extraargs.go index fb54eb95e1dd..027a79a335c7 100644 --- a/pkg/clusterapi/extraargs.go +++ b/pkg/clusterapi/extraargs.go @@ -53,17 +53,6 @@ func EtcdEncryptionExtraArgs(config *[]v1alpha1.EtcdEncryption) ExtraArgs { return args } -// FeatureGatesExtraArgs takes a list of features with the value and returns it in the proper format -// Example FeatureGatesExtraArgs("ServiceLoadBalancerClass=true"). -func FeatureGatesExtraArgs(features ...string) ExtraArgs { - if len(features) == 0 { - return nil - } - return ExtraArgs{ - "feature-gates": strings.Join(features[:], ","), - } -} - func PodIAMAuthExtraArgs(podIAMConfig *v1alpha1.PodIAMConfig) ExtraArgs { if podIAMConfig == nil { return nil diff --git a/pkg/clusterapi/extraargs_test.go b/pkg/clusterapi/extraargs_test.go index 50c8f0404d61..b5769134867b 100644 --- a/pkg/clusterapi/extraargs_test.go +++ b/pkg/clusterapi/extraargs_test.go @@ -621,39 +621,3 @@ func TestEtcdEncryptionExtraArgs(t *testing.T) { }) } } - -func TestFeatureGatesExtraArgs(t *testing.T) { - tests := []struct { - testName string - features []string - want clusterapi.ExtraArgs - }{ - { - testName: "no feature gates", - features: []string{}, - want: nil, - }, - { - testName: "single feature gate", - features: []string{"feature1=true"}, - want: clusterapi.ExtraArgs{ - "feature-gates": "feature1=true", - }, - }, - { - testName: "multiple feature gates", - features: []string{"feature1=true", "feature2=false", "feature3=true"}, - want: clusterapi.ExtraArgs{ - "feature-gates": "feature1=true,feature2=false,feature3=true", - }, - }, - } - - for _, tt := range tests { - t.Run(tt.testName, func(t *testing.T) { - if got := clusterapi.FeatureGatesExtraArgs(tt.features...); !reflect.DeepEqual(got, tt.want) { - t.Errorf("FeatureGatesExtraArgs() = %v, want %v", got, tt.want) - } - }) - } -} diff --git a/pkg/providers/tinkerbell/controlplane_test.go b/pkg/providers/tinkerbell/controlplane_test.go index 284f27c2f934..6937915f193e 100644 --- a/pkg/providers/tinkerbell/controlplane_test.go +++ b/pkg/providers/tinkerbell/controlplane_test.go @@ -246,7 +246,6 @@ spec: audit-log-maxbackup: "10" audit-log-maxsize: "512" authentication-token-webhook-config-file: /etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml @@ -574,7 +573,6 @@ spec: audit-log-maxbackup: "10" audit-log-maxsize: "512" authentication-token-webhook-config-file: /etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/template.go b/pkg/providers/tinkerbell/template.go index cc4173389a5b..5ece85852b20 100644 --- a/pkg/providers/tinkerbell/template.go +++ b/pkg/providers/tinkerbell/template.go @@ -401,11 +401,6 @@ func buildTemplateMapCP( Append(clusterapi.AwsIamAuthExtraArgs(clusterSpec.AWSIamConfig)). Append(clusterapi.PodIAMAuthExtraArgs(clusterSpec.Cluster.Spec.PodIAMConfig)) - // LoadBalancerClass is feature gated in K8S v1.21 and needs to be enabled manually - if clusterSpec.Cluster.Spec.KubernetesVersion == v1alpha1.Kube121 { - apiServerExtraArgs.Append(clusterapi.FeatureGatesExtraArgs("ServiceLoadBalancerClass=true")) - } - kubeletExtraArgs := clusterapi.SecureTlsCipherSuitesExtraArgs(). Append(clusterapi.ResolvConfExtraArgs(clusterSpec.Cluster.Spec.ClusterNetwork.DNS.ResolvConf)). Append(clusterapi.ControlPlaneNodeLabelsExtraArgs(clusterSpec.Cluster.Spec.ControlPlaneConfiguration)) diff --git a/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_domain_name.yaml b/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_domain_name.yaml index 4cb6e6625d4b..d85a4e0aa229 100644 --- a/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_domain_name.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_domain_name.yaml @@ -48,7 +48,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_ip.yaml b/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_ip.yaml index b497f8307d39..bfc0e5e6f321 100644 --- a/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_ip.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_cluster_tinkerbell_api_server_cert_san_ip.yaml @@ -48,7 +48,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml index 509e69fb8082..a0702c73cbc4 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml @@ -82,7 +82,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /var/lib/kubeadm/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_cp.yaml index 73f26dcf0397..5d6031cd5595 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_cp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_cp.yaml @@ -65,7 +65,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /var/lib/kubeadm/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_cp.yaml index 686a54386389..991a74116667 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_cp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_cp.yaml @@ -52,7 +52,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /var/lib/kubeadm/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_cp.yaml index bd76ca91d187..b016690b3e04 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_cp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_cp.yaml @@ -61,7 +61,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /var/lib/kubeadm/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_upgrade_cert_bundles_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_upgrade_cert_bundles_config_cp.yaml index 3613b2f5fed2..df15db46c032 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_upgrade_cert_bundles_config_cp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_upgrade_cert_bundles_config_cp.yaml @@ -40,7 +40,6 @@ spec: audit-log-maxsize: "512" audit-log-path: /var/log/kubernetes/api-audit.log audit-policy-file: /etc/kubernetes/audit-policy.yaml - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /var/lib/kubeadm/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_minimal_registry_mirror.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_minimal_registry_mirror.yaml index 31e9f3e1d8ec..6fbd929c77be 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_minimal_registry_mirror.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_minimal_registry_mirror.yaml @@ -54,7 +54,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /var/lib/kubeadm/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml index b1f890829731..2944bc2e0206 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml @@ -72,7 +72,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /var/lib/kubeadm/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_cert.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_cert.yaml index 2f43a51c3082..6b2e41585008 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_cert.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_cert.yaml @@ -72,7 +72,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /var/lib/kubeadm/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_awsiam.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_awsiam.yaml index 150a1937e7c5..3117c2a9809f 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_awsiam.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_awsiam.yaml @@ -47,7 +47,6 @@ spec: audit-log-maxbackup: "10" audit-log-maxsize: "512" authentication-token-webhook-config-file: /etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_external_etcd.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_external_etcd.yaml index 7bcd509a1be4..733edcf59afe 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_external_etcd.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_external_etcd.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_full_oidc.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_full_oidc.yaml index fc1e3c77f9fd..ecc560aef738 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_full_oidc.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_full_oidc.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true oidc-client-id: my-client-id oidc-groups-claim: claim1 oidc-groups-prefix: prefix-for-groups diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_oidc.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_oidc.yaml index 37b45d5b2a82..80125553a0f2 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_oidc.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_oidc.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true oidc-client-id: my-client-id oidc-issuer-url: https://mydomain.com/issuer extraVolumes: diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_registry_mirror.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_registry_mirror.yaml index e143264aa9da..f45ad44df1ee 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_registry_mirror.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_registry_mirror.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_labels.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_labels.yaml index 41d0de1e3221..e4132e61cb26 100755 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_labels.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_labels.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_taints.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_taints.yaml index b7265ffa92fc..ef7887d5c5dc 100755 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_taints.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_node_taints.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_proxy.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_proxy.yaml index 28b3753da2a0..a6a01ef4b3a0 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_proxy.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_proxy.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml index cefe77616ecf..291117ecbe42 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_cert.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_cert.yaml index 888d6991e601..1b44d18ca68f 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_cert.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_cert.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node.yaml index 79170f8a363e..cc4d6b91fa51 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_in_place.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_in_place.yaml index ed8167ea736e..6bcc29aeb4be 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_in_place.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_in_place.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_skip_lb.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_skip_lb.yaml index aaa53d1fc042..1472db85875d 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_skip_lb.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_single_node_skip_lb.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_stacked_etcd.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_stacked_etcd.yaml index 7bcd509a1be4..733edcf59afe 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_stacked_etcd.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_stacked_etcd.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_disable_kube_vip.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_disable_kube_vip.yaml index 5ec968902d13..94d29c647108 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_disable_kube_vip.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_disable_kube_vip.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_missing_ssh_keys.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_missing_ssh_keys.yaml index 7bcd509a1be4..733edcf59afe 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_missing_ssh_keys.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_missing_ssh_keys.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_upgrade_registry_mirror.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_upgrade_registry_mirror.yaml index f8f093457368..9e7c2231f0d6 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_upgrade_registry_mirror.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_upgrade_registry_mirror.yaml @@ -40,7 +40,6 @@ spec: audit-log-maxsize: "512" audit-log-path: /var/log/kubernetes/api-audit.log audit-policy-file: /etc/kubernetes/audit-policy.yaml - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cp_template.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cp_template.yaml index 396f01e6d59d..ff6f69cdb14c 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cp_template.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cp_template.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_tinkerbell_pod_iam_config.yaml b/pkg/providers/tinkerbell/testdata/expected_results_tinkerbell_pod_iam_config.yaml index 59dda7b09a94..941541900efb 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_tinkerbell_pod_iam_config.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_tinkerbell_pod_iam_config.yaml @@ -47,7 +47,6 @@ spec: audit-log-maxbackup: "10" audit-log-maxsize: "512" authentication-token-webhook-config-file: /etc/kubernetes/aws-iam-authenticator/kubeconfig.yaml - feature-gates: ServiceLoadBalancerClass=true service-account-issuer: https://test extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml diff --git a/pkg/providers/tinkerbell/testdata/expected_results_ubuntu_ntp_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_ubuntu_ntp_config_cp.yaml index fee628d6b254..766ffb2a5370 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_ubuntu_ntp_config_cp.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_ubuntu_ntp_config_cp.yaml @@ -46,7 +46,6 @@ spec: audit-log-maxage: "30" audit-log-maxbackup: "10" audit-log-maxsize: "512" - feature-gates: ServiceLoadBalancerClass=true extraVolumes: - hostPath: /etc/kubernetes/audit-policy.yaml mountPath: /etc/kubernetes/audit-policy.yaml