Move defaulter functions to public methods with a convention

pkg/apis/apps/v1alpha1/defaulting.go

@@ -23,22 +23,24 @@ import (
 
 func addDefaultingFuncs(scheme *runtime.Scheme) {
 	scheme.AddDefaultingFuncs(
-		func(obj *PetSet) {
-			labels := obj.Spec.Template.Labels
-			if labels != nil {
-				if obj.Spec.Selector == nil {
-					obj.Spec.Selector = &unversioned.LabelSelector{
-						MatchLabels: labels,
-					}
-				}
-				if len(obj.Labels) == 0 {
-					obj.Labels = labels
-				}
-			}
-			if obj.Spec.Replicas == nil {
-				obj.Spec.Replicas = new(int32)
-				*obj.Spec.Replicas = 1
-			}
-		},
+		SetDefaults_PetSet,
 	)
 }
+
+func SetDefaults_PetSet(obj *PetSet) {
+	labels := obj.Spec.Template.Labels
+	if labels != nil {
+		if obj.Spec.Selector == nil {
+			obj.Spec.Selector = &unversioned.LabelSelector{
+				MatchLabels: labels,
+			}
+		}
+		if len(obj.Labels) == 0 {
+			obj.Labels = labels
+		}
+	}
+	if obj.Spec.Replicas == nil {
+		obj.Spec.Replicas = new(int32)
+		*obj.Spec.Replicas = 1
+	}
+}

pkg/apis/autoscaling/v1/defaults.go

@@ -22,11 +22,13 @@ import (
 
 func addDefaultingFuncs(scheme *runtime.Scheme) {
 	scheme.AddDefaultingFuncs(
-		func(obj *HorizontalPodAutoscaler) {
-			if obj.Spec.MinReplicas == nil {
-				minReplicas := int32(1)
-				obj.Spec.MinReplicas = &minReplicas
-			}
-		},
+		SetDefaults_HorizontalPodAutoscaler,
 	)
 }
+
+func SetDefaults_HorizontalPodAutoscaler(obj *HorizontalPodAutoscaler) {
+	if obj.Spec.MinReplicas == nil {
+		minReplicas := int32(1)
+		obj.Spec.MinReplicas = &minReplicas
+	}
+}

pkg/apis/batch/v1/defaults.go

@@ -22,19 +22,21 @@ import (
 
 func addDefaultingFuncs(scheme *runtime.Scheme) {
 	scheme.AddDefaultingFuncs(
-		func(obj *Job) {
-			// For a non-parallel job, you can leave both `.spec.completions` and
-			// `.spec.parallelism` unset.  When both are unset, both are defaulted to 1.
-			if obj.Spec.Completions == nil && obj.Spec.Parallelism == nil {
-				obj.Spec.Completions = new(int32)
-				*obj.Spec.Completions = 1
-				obj.Spec.Parallelism = new(int32)
-				*obj.Spec.Parallelism = 1
-			}
-			if obj.Spec.Parallelism == nil {
-				obj.Spec.Parallelism = new(int32)
-				*obj.Spec.Parallelism = 1
-			}
-		},
+		SetDefaults_Job,
 	)
 }
+
+func SetDefaults_Job(obj *Job) {
+	// For a non-parallel job, you can leave both `.spec.completions` and
+	// `.spec.parallelism` unset.  When both are unset, both are defaulted to 1.
+	if obj.Spec.Completions == nil && obj.Spec.Parallelism == nil {
+		obj.Spec.Completions = new(int32)
+		*obj.Spec.Completions = 1
+		obj.Spec.Parallelism = new(int32)
+		*obj.Spec.Parallelism = 1
+	}
+	if obj.Spec.Parallelism == nil {
+		obj.Spec.Parallelism = new(int32)
+		*obj.Spec.Parallelism = 1
+	}
+}

pkg/apis/componentconfig/v1alpha1/defaults.go

@@ -28,72 +28,78 @@ import (
 
 func addDefaultingFuncs(scheme *runtime.Scheme) {
 	scheme.AddDefaultingFuncs(
-		func(obj *KubeProxyConfiguration) {
-			if obj.BindAddress == "" {
-				obj.BindAddress = "0.0.0.0"
-			}
-			if obj.HealthzPort == 0 {
-				obj.HealthzPort = 10249
-			}
-			if obj.HealthzBindAddress == "" {
-				obj.HealthzBindAddress = "127.0.0.1"
-			}
-			if obj.OOMScoreAdj == nil {
-				temp := int32(qos.KubeProxyOOMScoreAdj)
-				obj.OOMScoreAdj = &temp
-			}
-			if obj.ResourceContainer == "" {
-				obj.ResourceContainer = "/kube-proxy"
-			}
-			if obj.IPTablesSyncPeriod.Duration == 0 {
-				obj.IPTablesSyncPeriod = unversioned.Duration{Duration: 30 * time.Second}
-			}
-			zero := unversioned.Duration{}
-			if obj.UDPIdleTimeout == zero {
-				obj.UDPIdleTimeout = unversioned.Duration{Duration: 250 * time.Millisecond}
-			}
-			if obj.ConntrackMax == 0 {
-				obj.ConntrackMax = 256 * 1024 // 4x default (64k)
-			}
-			if obj.IPTablesMasqueradeBit == nil {
-				temp := int32(14)
-				obj.IPTablesMasqueradeBit = &temp
-			}
-			if obj.ConntrackTCPEstablishedTimeout == zero {
-				obj.ConntrackTCPEstablishedTimeout = unversioned.Duration{Duration: 24 * time.Hour} // 1 day (1/5 default)
-			}
-		},
-		func(obj *KubeSchedulerConfiguration) {
-			if obj.Port == 0 {
-				obj.Port = ports.SchedulerPort
-			}
-			if obj.Address == "" {
-				obj.Address = "0.0.0.0"
-			}
-			if obj.AlgorithmProvider == "" {
-				obj.AlgorithmProvider = "DefaultProvider"
-			}
-			if obj.KubeAPIQPS == 0 {
-				obj.KubeAPIQPS = 50.0
-			}
-			if obj.KubeAPIBurst == 0 {
-				obj.KubeAPIBurst = 100
-			}
-			if obj.SchedulerName == "" {
-				obj.SchedulerName = api.DefaultSchedulerName
-			}
-		},
-		func(obj *LeaderElectionConfiguration) {
-			zero := unversioned.Duration{}
-			if obj.LeaseDuration == zero {
-				obj.LeaseDuration = unversioned.Duration{Duration: 15 * time.Second}
-			}
-			if obj.RenewDeadline == zero {
-				obj.RenewDeadline = unversioned.Duration{Duration: 10 * time.Second}
-			}
-			if obj.RetryPeriod == zero {
-				obj.RetryPeriod = unversioned.Duration{Duration: 2 * time.Second}
-			}
-		},
+		SetDefaults_KubeProxyConfiguration,
+		SetDefaults_KubeSchedulerConfiguration,
+		SetDefaults_LeaderElectionConfiguration,
 	)
 }
+
+func SetDefaults_KubeProxyConfiguration(obj *KubeProxyConfiguration) {
+	if obj.BindAddress == "" {
+		obj.BindAddress = "0.0.0.0"
+	}
+	if obj.HealthzPort == 0 {
+		obj.HealthzPort = 10249
+	}
+	if obj.HealthzBindAddress == "" {
+		obj.HealthzBindAddress = "127.0.0.1"
+	}
+	if obj.OOMScoreAdj == nil {
+		temp := int32(qos.KubeProxyOOMScoreAdj)
+		obj.OOMScoreAdj = &temp
+	}
+	if obj.ResourceContainer == "" {
+		obj.ResourceContainer = "/kube-proxy"
+	}
+	if obj.IPTablesSyncPeriod.Duration == 0 {
+		obj.IPTablesSyncPeriod = unversioned.Duration{Duration: 30 * time.Second}
+	}
+	zero := unversioned.Duration{}
+	if obj.UDPIdleTimeout == zero {
+		obj.UDPIdleTimeout = unversioned.Duration{Duration: 250 * time.Millisecond}
+	}
+	if obj.ConntrackMax == 0 {
+		obj.ConntrackMax = 256 * 1024 // 4x default (64k)
+	}
+	if obj.IPTablesMasqueradeBit == nil {
+		temp := int32(14)
+		obj.IPTablesMasqueradeBit = &temp
+	}
+	if obj.ConntrackTCPEstablishedTimeout == zero {
+		obj.ConntrackTCPEstablishedTimeout = unversioned.Duration{Duration: 24 * time.Hour} // 1 day (1/5 default)
+	}
+}
+
+func SetDefaults_KubeSchedulerConfiguration(obj *KubeSchedulerConfiguration) {
+	if obj.Port == 0 {
+		obj.Port = ports.SchedulerPort
+	}
+	if obj.Address == "" {
+		obj.Address = "0.0.0.0"
+	}
+	if obj.AlgorithmProvider == "" {
+		obj.AlgorithmProvider = "DefaultProvider"
+	}
+	if obj.KubeAPIQPS == 0 {
+		obj.KubeAPIQPS = 50.0
+	}
+	if obj.KubeAPIBurst == 0 {
+		obj.KubeAPIBurst = 100
+	}
+	if obj.SchedulerName == "" {
+		obj.SchedulerName = api.DefaultSchedulerName
+	}
+}
+
+func SetDefaults_LeaderElectionConfiguration(obj *LeaderElectionConfiguration) {
+	zero := unversioned.Duration{}
+	if obj.LeaseDuration == zero {
+		obj.LeaseDuration = unversioned.Duration{Duration: 15 * time.Second}
+	}
+	if obj.RenewDeadline == zero {
+		obj.RenewDeadline = unversioned.Duration{Duration: 10 * time.Second}
+	}
+	if obj.RetryPeriod == zero {
+		obj.RetryPeriod = unversioned.Duration{Duration: 2 * time.Second}
+	}
+}

pkg/apis/extensions/v1beta1/defaults.go

@@ -23,122 +23,130 @@ import (
 
 func addDefaultingFuncs(scheme *runtime.Scheme) {
 	scheme.AddDefaultingFuncs(
-		func(obj *APIVersion) {
-		},
-		func(obj *DaemonSet) {
-			labels := obj.Spec.Template.Labels
-
-			// TODO: support templates defined elsewhere when we support them in the API
-			if labels != nil {
-				if obj.Spec.Selector == nil {
-					obj.Spec.Selector = &LabelSelector{
-						MatchLabels: labels,
-					}
-				}
-				if len(obj.Labels) == 0 {
-					obj.Labels = labels
-				}
-			}
-		},
-		func(obj *Deployment) {
-			// Default labels and selector to labels from pod template spec.
-			labels := obj.Spec.Template.Labels
-
-			if labels != nil {
-				if obj.Spec.Selector == nil {
-					obj.Spec.Selector = &LabelSelector{MatchLabels: labels}
-				}
-				if len(obj.Labels) == 0 {
-					obj.Labels = labels
-				}
-			}
-			// Set DeploymentSpec.Replicas to 1 if it is not set.
-			if obj.Spec.Replicas == nil {
-				obj.Spec.Replicas = new(int32)
-				*obj.Spec.Replicas = 1
-			}
-			strategy := &obj.Spec.Strategy
-			// Set default DeploymentStrategyType as RollingUpdate.
-			if strategy.Type == "" {
-				strategy.Type = RollingUpdateDeploymentStrategyType
-			}
-			if strategy.Type == RollingUpdateDeploymentStrategyType {
-				if strategy.RollingUpdate == nil {
-					rollingUpdate := RollingUpdateDeployment{}
-					strategy.RollingUpdate = &rollingUpdate
-				}
-				if strategy.RollingUpdate.MaxUnavailable == nil {
-					// Set default MaxUnavailable as 1 by default.
-					maxUnavailable := intstr.FromInt(1)
-					strategy.RollingUpdate.MaxUnavailable = &maxUnavailable
-				}
-				if strategy.RollingUpdate.MaxSurge == nil {
-					// Set default MaxSurge as 1 by default.
-					maxSurge := intstr.FromInt(1)
-					strategy.RollingUpdate.MaxSurge = &maxSurge
-				}
-			}
-		},
-		func(obj *Job) {
-			labels := obj.Spec.Template.Labels
-			// TODO: support templates defined elsewhere when we support them in the API
-			if labels != nil {
-				// if an autoselector is requested, we'll build the selector later with controller-uid and job-name
-				autoSelector := bool(obj.Spec.AutoSelector != nil && *obj.Spec.AutoSelector)
-
-				// otherwise, we are using a manual selector
-				manualSelector := !autoSelector
-
-				// and default behavior for an unspecified manual selector is to use the pod template labels
-				if manualSelector && obj.Spec.Selector == nil {
-					obj.Spec.Selector = &LabelSelector{
-						MatchLabels: labels,
-					}
-				}
-				if len(obj.Labels) == 0 {
-					obj.Labels = labels
-				}
-			}
-			// For a non-parallel job, you can leave both `.spec.completions` and
-			// `.spec.parallelism` unset.  When both are unset, both are defaulted to 1.
-			if obj.Spec.Completions == nil && obj.Spec.Parallelism == nil {
-				obj.Spec.Completions = new(int32)
-				*obj.Spec.Completions = 1
-				obj.Spec.Parallelism = new(int32)
-				*obj.Spec.Parallelism = 1
-			}
-			if obj.Spec.Parallelism == nil {
-				obj.Spec.Parallelism = new(int32)
-				*obj.Spec.Parallelism = 1
-			}
-		},
-		func(obj *HorizontalPodAutoscaler) {
-			if obj.Spec.MinReplicas == nil {
-				minReplicas := int32(1)
-				obj.Spec.MinReplicas = &minReplicas
-			}
-			if obj.Spec.CPUUtilization == nil {
-				obj.Spec.CPUUtilization = &CPUTargetUtilization{TargetPercentage: 80}
+		SetDefaults_DaemonSet,
+		SetDefaults_Deployment,
+		SetDefaults_Job,
+		SetDefaults_HorizontalPodAutoscaler,
+		SetDefaults_ReplicaSet,
+	)
+}
+
+func SetDefaults_DaemonSet(obj *DaemonSet) {
+	labels := obj.Spec.Template.Labels
+
+	// TODO: support templates defined elsewhere when we support them in the API
+	if labels != nil {
+		if obj.Spec.Selector == nil {
+			obj.Spec.Selector = &LabelSelector{
+				MatchLabels: labels,
 			}
-		},
-		func(obj *ReplicaSet) {
-			labels := obj.Spec.Template.Labels
-
-			// TODO: support templates defined elsewhere when we support them in the API
-			if labels != nil {
-				if obj.Spec.Selector == nil {
-					obj.Spec.Selector = &LabelSelector{
-						MatchLabels: labels,
-					}
-				}
-				if len(obj.Labels) == 0 {
-					obj.Labels = labels
-				}
+		}
+		if len(obj.Labels) == 0 {
+			obj.Labels = labels
+		}
+	}
+}
+
+func SetDefaults_Deployment(obj *Deployment) {
+	// Default labels and selector to labels from pod template spec.
+	labels := obj.Spec.Template.Labels
+
+	if labels != nil {
+		if obj.Spec.Selector == nil {
+			obj.Spec.Selector = &LabelSelector{MatchLabels: labels}
+		}
+		if len(obj.Labels) == 0 {
+			obj.Labels = labels
+		}
+	}
+	// Set DeploymentSpec.Replicas to 1 if it is not set.
+	if obj.Spec.Replicas == nil {
+		obj.Spec.Replicas = new(int32)
+		*obj.Spec.Replicas = 1
+	}
+	strategy := &obj.Spec.Strategy
+	// Set default DeploymentStrategyType as RollingUpdate.
+	if strategy.Type == "" {
+		strategy.Type = RollingUpdateDeploymentStrategyType
+	}
+	if strategy.Type == RollingUpdateDeploymentStrategyType {
+		if strategy.RollingUpdate == nil {
+			rollingUpdate := RollingUpdateDeployment{}
+			strategy.RollingUpdate = &rollingUpdate
+		}
+		if strategy.RollingUpdate.MaxUnavailable == nil {
+			// Set default MaxUnavailable as 1 by default.
+			maxUnavailable := intstr.FromInt(1)
+			strategy.RollingUpdate.MaxUnavailable = &maxUnavailable
+		}
+		if strategy.RollingUpdate.MaxSurge == nil {
+			// Set default MaxSurge as 1 by default.
+			maxSurge := intstr.FromInt(1)
+			strategy.RollingUpdate.MaxSurge = &maxSurge
+		}
+	}
+}
+
+func SetDefaults_Job(obj *Job) {
+	labels := obj.Spec.Template.Labels
+	// TODO: support templates defined elsewhere when we support them in the API
+	if labels != nil {
+		// if an autoselector is requested, we'll build the selector later with controller-uid and job-name
+		autoSelector := bool(obj.Spec.AutoSelector != nil && *obj.Spec.AutoSelector)
+
+		// otherwise, we are using a manual selector
+		manualSelector := !autoSelector
+
+		// and default behavior for an unspecified manual selector is to use the pod template labels
+		if manualSelector && obj.Spec.Selector == nil {
+			obj.Spec.Selector = &LabelSelector{
+				MatchLabels: labels,
 			}
-			if obj.Spec.Replicas == nil {
-				obj.Spec.Replicas = new(int32)
-				*obj.Spec.Replicas = 1
+		}
+		if len(obj.Labels) == 0 {
+			obj.Labels = labels
+		}
+	}
+	// For a non-parallel job, you can leave both `.spec.completions` and
+	// `.spec.parallelism` unset.  When both are unset, both are defaulted to 1.
+	if obj.Spec.Completions == nil && obj.Spec.Parallelism == nil {
+		obj.Spec.Completions = new(int32)
+		*obj.Spec.Completions = 1
+		obj.Spec.Parallelism = new(int32)
+		*obj.Spec.Parallelism = 1
+	}
+	if obj.Spec.Parallelism == nil {
+		obj.Spec.Parallelism = new(int32)
+		*obj.Spec.Parallelism = 1
+	}
+}
+
+func SetDefaults_HorizontalPodAutoscaler(obj *HorizontalPodAutoscaler) {
+	if obj.Spec.MinReplicas == nil {
+		minReplicas := int32(1)
+		obj.Spec.MinReplicas = &minReplicas
+	}
+	if obj.Spec.CPUUtilization == nil {
+		obj.Spec.CPUUtilization = &CPUTargetUtilization{TargetPercentage: 80}
+	}
+}
+
+func SetDefaults_ReplicaSet(obj *ReplicaSet) {
+	labels := obj.Spec.Template.Labels
+
+	// TODO: support templates defined elsewhere when we support them in the API
+	if labels != nil {
+		if obj.Spec.Selector == nil {
+			obj.Spec.Selector = &LabelSelector{
+				MatchLabels: labels,
 			}
-		},
-	)
+		}
+		if len(obj.Labels) == 0 {
+			obj.Labels = labels
+		}
+	}
+	if obj.Spec.Replicas == nil {
+		obj.Spec.Replicas = new(int32)
+		*obj.Spec.Replicas = 1
+	}
 }