Skip to content
Open
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
4 changes: 4 additions & 0 deletions cmd/minikube/cmd/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ var settings = []Setting{
name: config.MaxAuditEntries,
set: SetInt,
},
{
name: config.DefaultDNSDomain,
set: SetString,
},
}

// ConfigCmd represents the config command
Expand Down
1 change: 1 addition & 0 deletions cmd/minikube/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ func setupViper() {
viper.SetDefault(config.WantVirtualBoxDriverWarning, true)
viper.SetDefault(config.MaxAuditEntries, 1000)
viper.SetDefault(config.SkipAuditFlag, false)
viper.SetDefault(config.DefaultDNSDomain, constants.DefaultDNSDomain)
}

func addToPath(dir string) {
Expand Down
7 changes: 5 additions & 2 deletions cmd/minikube/cmd/start_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ func initKubernetesFlags() {
Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler
Valid kubeadm parameters: `+fmt.Sprintf("%s, %s", strings.Join(bsutil.KubeadmExtraArgsAllowed[bsutil.KubeadmCmdParam], ", "), strings.Join(bsutil.KubeadmExtraArgsAllowed[bsutil.KubeadmConfigParam], ",")))
startCmd.Flags().String(featureGates, "", "A set of key=value pairs that describe feature gates for alpha/experimental features.")
startCmd.Flags().String(dnsDomain, constants.ClusterDNSDomain, "The cluster dns domain name used in the Kubernetes cluster")
startCmd.Flags().String(dnsDomain, constants.DefaultDNSDomain, "The cluster dns domain name used in the Kubernetes cluster")
startCmd.Flags().Int(apiServerPort, constants.APIServerPort, "The apiserver listening port")
startCmd.Flags().String(apiServerName, constants.APIServerName, "The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine")
startCmd.Flags().StringSliceVar(&apiServerNames, "apiserver-names", nil, "A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine")
Expand Down Expand Up @@ -562,6 +562,9 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str
out.WarningT("--network flag is only valid with the docker/podman, qemu, kvm, and vfkit drivers, it will be ignored")
}

clusterDNSDomain := viper.GetString(config.DefaultDNSDomain)
updateStringFromFlag(cmd, &clusterDNSDomain, dnsDomain)

validateHANodeCount(cmd)

checkNumaCount(k8sVersion)
Expand Down Expand Up @@ -638,7 +641,7 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str
APIServerName: viper.GetString(apiServerName),
APIServerNames: apiServerNames,
APIServerIPs: apiServerIPs,
DNSDomain: viper.GetString(dnsDomain),
DNSDomain: clusterDNSDomain,
FeatureGates: viper.GetString(featureGates),
ContainerRuntime: rtime,
CRISocket: viper.GetString(criSocket),
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/bootstrapper/certs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func TestSetupCerts(t *testing.T) {
CertExpiration: constants.DefaultCertExpiration,
KubernetesConfig: config.KubernetesConfig{
APIServerName: constants.APIServerName,
DNSDomain: constants.ClusterDNSDomain,
DNSDomain: constants.DefaultDNSDomain,
ServiceCIDR: constants.DefaultServiceCIDR,
},
}
Expand Down
3 changes: 3 additions & 0 deletions pkg/minikube/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ const (
EmbedCerts = "EmbedCerts"
// MaxAuditEntries is the maximum number of audit entries to retain
MaxAuditEntries = "MaxAuditEntries"
// DefaultDnsDomain is the key for the default dns domain name when creating
// a cluster
DefaultDNSDomain = "default-dns-domain"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const (
// APIServerName is the default API server name
APIServerName = "minikubeCA"
// ClusterDNSDomain is the default DNS domain
ClusterDNSDomain = "cluster.local"
DefaultDNSDomain = "cluster.local"
// DefaultServiceCIDR is The CIDR to be used for service cluster IPs
DefaultServiceCIDR = "10.96.0.0/12"
// HostAlias is a DNS alias to the container/VM host IP
Expand Down
1 change: 1 addition & 0 deletions site/content/en/docs/commands/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Configurable fields:
* native-ssh
* rootless
* MaxAuditEntries
* default-dns-domain

```shell
minikube config SUBCOMMAND [flags]
Expand Down
Loading