Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

⚠️ ClusterConfigration.Networking.* fields are now optional #287

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions kubeadm/v1beta1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down