diff --git a/.gitignore b/.gitignore index f750c3d..d87ff2c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ bin *.test # Output of the go coverage tool, specifically when used with LiteIDE +out/ *.out # Kubernetes Generated files - skip generated files, except for vendored files diff --git a/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml index 4c2056f..36888d0 100644 --- a/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml +++ b/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml @@ -298,9 +298,7 @@ spec: Defaults to "10.96.0.0/12". type: string required: - - dnsDomain - podSubnet - - serviceSubnet type: object scheduler: description: Scheduler contains extra settings for the scheduler diff --git a/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml b/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml index 2269dfe..0cb2344 100644 --- a/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml +++ b/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml @@ -317,9 +317,7 @@ spec: services. Defaults to "10.96.0.0/12". type: string required: - - dnsDomain - podSubnet - - serviceSubnet type: object scheduler: description: Scheduler contains extra settings for the scheduler diff --git a/kubeadm/v1beta1/types.go b/kubeadm/v1beta1/types.go index 1b07ce3..4a9249f 100644 --- a/kubeadm/v1beta1/types.go +++ b/kubeadm/v1beta1/types.go @@ -227,11 +227,13 @@ type NodeRegistrationOptions struct { // Networking contains elements describing cluster's networking configuration type Networking struct { // ServiceSubnet is the subnet used by k8s services. Defaults to "10.96.0.0/12". - ServiceSubnet string `json:"serviceSubnet"` + // +optional + ServiceSubnet string `json:"serviceSubnet,omitempty"` // PodSubnet is the subnet used by pods. PodSubnet string `json:"podSubnet"` // DNSDomain is the dns domain used by k8s services. Defaults to "cluster.local". - DNSDomain string `json:"dnsDomain"` + // +optional + DNSDomain string `json:"dnsDomain,omitempty"` } // BootstrapToken describes one bootstrap token, stored as a Secret in the cluster