kubeadm: add defaulting for kubeadm config api group

cmd/kubeadm/app/apis/kubeadm/BUILD

@@ -13,7 +13,6 @@ load(
 go_library(
     name = "go_default_library",
     srcs = [
-        "defaults.go",
         "doc.go",
         "env.go",
         "register.go",

cmd/kubeadm/app/apis/kubeadm/register.go

@@ -22,17 +22,17 @@ import (
 	"k8s.io/kubernetes/pkg/runtime"
 )
 
-var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
-)
-
 // GroupName is the group name use in this package
 const GroupName = "kubeadm.k8s.io"
 
 // SchemeGroupVersion is group version used to register these objects
 var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}
 
+var (
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	AddToScheme   = SchemeBuilder.AddToScheme
+)
+
 // Kind takes an unqualified kind and returns a Group qualified GroupKind
 func Kind(kind string) unversioned.GroupKind {
 	return SchemeGroupVersion.WithKind(kind).GroupKind()

cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD

@@ -13,9 +13,11 @@ load(
 go_library(
     name = "go_default_library",
     srcs = [
+        "defaults.go",
         "doc.go",
         "register.go",
         "types.go",
+        "zz_generated.defaults.go",
     ],
     tags = ["automanaged"],
     deps = [

cmd/kubeadm/app/apis/kubeadm/defaults.go → cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go

@@ -14,7 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kubeadm
+package v1alpha1
+
+import (
+	"k8s.io/kubernetes/pkg/runtime"
+)
 
 const (
 	DefaultServiceDNSDomain  = "cluster.local"
@@ -23,3 +27,43 @@ const (
 	DefaultAPIBindPort       = 6443
 	DefaultDiscoveryBindPort = 9898
 )
+
+func addDefaultingFuncs(scheme *runtime.Scheme) error {
+	RegisterDefaults(scheme)
+	return scheme.AddDefaultingFuncs(
+		SetDefaults_MasterConfiguration,
+		SetDefaults_NodeConfiguration,
+	)
+}
+
+func SetDefaults_MasterConfiguration(obj *MasterConfiguration) {
+	if obj.KubernetesVersion == "" {
+		obj.KubernetesVersion = DefaultKubernetesVersion
+	}
+
+	if obj.API.BindPort == 0 {
+		obj.API.BindPort = DefaultAPIBindPort
+	}
+
+	if obj.Discovery.BindPort == 0 {
+		obj.Discovery.BindPort = DefaultDiscoveryBindPort
+	}
+
+	if obj.Networking.ServiceSubnet == "" {
+		obj.Networking.ServiceSubnet = DefaultServicesSubnet
+	}
+
+	if obj.Networking.DNSDomain == "" {
+		obj.Networking.DNSDomain = DefaultServiceDNSDomain
+	}
+}
+
+func SetDefaults_NodeConfiguration(obj *NodeConfiguration) {
+	if obj.APIPort == 0 {
+		obj.APIPort = DefaultAPIBindPort
+	}
+
+	if obj.DiscoveryPort == 0 {
+		obj.DiscoveryPort = DefaultDiscoveryBindPort
+	}
+}

cmd/kubeadm/app/apis/kubeadm/v1alpha1/doc.go

@@ -14,5 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// +k8s:defaulter-gen=TypeMeta
 // +groupName=kubeadm.k8s.io
 package v1alpha1 // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"

cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go

@@ -22,17 +22,17 @@ import (
 	"k8s.io/kubernetes/pkg/runtime"
 )
 
-var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
-)
-
 // GroupName is the group name use in this package
 const GroupName = "kubeadm.k8s.io"
 
 // SchemeGroupVersion is group version used to register these objects
 var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"}
 
+var (
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs)
+	AddToScheme   = SchemeBuilder.AddToScheme
+)
+
 // Kind takes an unqualified kind and returns a Group qualified GroupKind
 func Kind(kind string) unversioned.GroupKind {
 	return SchemeGroupVersion.WithKind(kind).GroupKind()