github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubeadm: don't default ExtraEnvs to an empty slice

Browse Source 
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.
This commit is contained in:
Lubomir I. Ivanov
2024-05-23 17:54:26 +03:00
parent 66c7fc5ab4
commit d0c656dc19
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go
View File

@@ -92,10 +92,10 @@ func fuzzClusterConfiguration(obj *kubeadm.ClusterConfiguration, c fuzz.Continue
obj.APIServer.TimeoutForControlPlane = &metav1.Duration{ obj.APIServer.TimeoutForControlPlane = &metav1.Duration{
Duration: 0, Duration: 0,
} }
obj.ControllerManager.ExtraEnvs = []kubeadm.EnvVar{} obj.ControllerManager.ExtraEnvs = nil
obj.APIServer.ExtraEnvs = []kubeadm.EnvVar{} obj.APIServer.ExtraEnvs = nil
obj.Scheduler.ExtraEnvs = []kubeadm.EnvVar{} obj.Scheduler.ExtraEnvs = nil
obj.Etcd.Local.ExtraEnvs = []kubeadm.EnvVar{} obj.Etcd.Local.ExtraEnvs = nil
obj.EncryptionAlgorithm = kubeadm.EncryptionAlgorithmRSA2048 obj.EncryptionAlgorithm = kubeadm.EncryptionAlgorithmRSA2048
obj.Proxy.Disabled = false obj.Proxy.Disabled = false
obj.CertificateValidityPeriod = &metav1.Duration{Duration: constants.CertificateValidityPeriod} obj.CertificateValidityPeriod = &metav1.Duration{Duration: constants.CertificateValidityPeriod}

6
cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go
View File

@@ -80,9 +80,8 @@ func Convert_v1beta3_ClusterConfiguration_To_kubeadm_ClusterConfiguration(in *Cl
return autoConvert_v1beta3_ClusterConfiguration_To_kubeadm_ClusterConfiguration(in, out, s) 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 { 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) out.ExtraArgs = convertToArgs(in.ExtraArgs)
return autoConvert_v1beta3_ControlPlaneComponent_To_kubeadm_ControlPlaneComponent(in, out, s) 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) 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 { 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) out.ExtraArgs = convertToArgs(in.ExtraArgs)
return autoConvert_v1beta3_LocalEtcd_To_kubeadm_LocalEtcd(in, out, s) return autoConvert_v1beta3_LocalEtcd_To_kubeadm_LocalEtcd(in, out, s)
} }