Skip to content

Commit 836aee0

Browse files
committed
Code review feedback.
1 parent bfacb51 commit 836aee0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

pkg/minikube/bootstrapper/kubeadm/templates.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ kind: MasterConfiguration
2929
api:
3030
advertiseAddress: {{.AdvertiseAddress}}
3131
bindPort: {{.APIServerPort}}
32+
controlPlaneEndpoint: localhost
3233
kubernetesVersion: {{.KubernetesVersion}}
3334
certificatesDir: {{.CertDir}}
3435
networking:
@@ -75,7 +76,7 @@ sudo /usr/bin/kubeadm alpha phase etcd local --config {{.KubeadmConfigFile}}
7576

7677
var kubeadmInitTemplate = template.Must(template.New("kubeadmInitTemplate").Parse(`
7778
sudo /usr/bin/kubeadm init --config {{.KubeadmConfigFile}} {{if .SkipPreflightChecks}}--skip-preflight-checks{{else}}{{range .Preflights}}--ignore-preflight-errors={{.}} {{end}}{{end}} &&
78-
sudo /usr/bin/kubeadm alpha phase addon all
79+
sudo /usr/bin/kubeadm alpha phase addon kube-dns
7980
`))
8081

8182
// printMapInOrder sorts the keys and prints the map in order, combining key

pkg/minikube/bootstrapper/kubeadm/versions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ var versionSpecificOpts = []VersionedExtraOption{
205205
Key: "admission-control",
206206
Value: strings.Join(util.DefaultAdmissionControllers, ","),
207207
},
208-
LessThanOrEqual: semver.MustParse("1.10.10"),
208+
LessThanOrEqual: semver.MustParse("1.10.1000"), // Semver doesn't support wildcards.
209209
GreaterThanOrEqual: semver.MustParse("1.9.0-alpha.0"),
210210
},
211211
{

0 commit comments

Comments
 (0)