From d0c656dc196e5b91d7151f3abb6b90a17f28de43 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Thu, 23 May 2024 17:54:26 +0300 Subject: [PATCH] kubeadm: don't default ExtraEnvs to an empty slice Instead of defaulting ExtraEnvs for CP components to an empty slice when converting from/to v1beta3 keep it nil. This allows for expecting a nil value in the internal config, similarly to ExtraArgs. --- cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go | 8 ++++---- cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go index 16cf50120c1..41a6b27c5e6 100644 --- a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go +++ b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go @@ -92,10 +92,10 @@ func fuzzClusterConfiguration(obj *kubeadm.ClusterConfiguration, c fuzz.Continue obj.APIServer.TimeoutForControlPlane = &metav1.Duration{ Duration: 0, } - obj.ControllerManager.ExtraEnvs = []kubeadm.EnvVar{} - obj.APIServer.ExtraEnvs = []kubeadm.EnvVar{} - obj.Scheduler.ExtraEnvs = []kubeadm.EnvVar{} - obj.Etcd.Local.ExtraEnvs = []kubeadm.EnvVar{} + obj.ControllerManager.ExtraEnvs = nil + obj.APIServer.ExtraEnvs = nil + obj.Scheduler.ExtraEnvs = nil + obj.Etcd.Local.ExtraEnvs = nil obj.EncryptionAlgorithm = kubeadm.EncryptionAlgorithmRSA2048 obj.Proxy.Disabled = false obj.CertificateValidityPeriod = &metav1.Duration{Duration: constants.CertificateValidityPeriod} diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go index 9ef21406f52..80516553aae 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go @@ -80,9 +80,8 @@ func Convert_v1beta3_ClusterConfiguration_To_kubeadm_ClusterConfiguration(in *Cl return autoConvert_v1beta3_ClusterConfiguration_To_kubeadm_ClusterConfiguration(in, out, s) } -// Convert_v1beta3_ControlPlaneComponent_To_kubeadm_ControlPlaneComponent is required due to the missing ControlPlaneComponent.ExtraEnvs in v1beta3. +// Convert_v1beta3_ControlPlaneComponent_To_kubeadm_ControlPlaneComponent is required due to the different ControlPlaneComponent.ExtraArgs in v1beta3. func Convert_v1beta3_ControlPlaneComponent_To_kubeadm_ControlPlaneComponent(in *ControlPlaneComponent, out *kubeadm.ControlPlaneComponent, s conversion.Scope) error { - out.ExtraEnvs = []kubeadm.EnvVar{} out.ExtraArgs = convertToArgs(in.ExtraArgs) return autoConvert_v1beta3_ControlPlaneComponent_To_kubeadm_ControlPlaneComponent(in, out, s) } @@ -93,9 +92,8 @@ func Convert_kubeadm_ControlPlaneComponent_To_v1beta3_ControlPlaneComponent(in * return autoConvert_kubeadm_ControlPlaneComponent_To_v1beta3_ControlPlaneComponent(in, out, s) } -// Convert_v1beta3_LocalEtcd_To_kubeadm_LocalEtcd is required due to the missing LocalEtcd.ExtraEnvs in v1beta3. +// Convert_v1beta3_LocalEtcd_To_kubeadm_LocalEtcd is required due to the different LocalEtcd.Args in v1beta3. func Convert_v1beta3_LocalEtcd_To_kubeadm_LocalEtcd(in *LocalEtcd, out *kubeadm.LocalEtcd, s conversion.Scope) error { - out.ExtraEnvs = []kubeadm.EnvVar{} out.ExtraArgs = convertToArgs(in.ExtraArgs) return autoConvert_v1beta3_LocalEtcd_To_kubeadm_LocalEtcd(in, out, s) }