提交 e2dd95ed 编写于 作者: M Matt Rickard

update kubeadm

上级 e68de40a
......@@ -18,6 +18,7 @@ package kubeadm
import (
"fmt"
"path/filepath"
"sort"
"strings"
......@@ -169,12 +170,24 @@ var versionSpecificOpts = []VersionedExtraOption{
},
GreaterThanOrEqual: semver.MustParse("1.8.0-alpha.0"),
},
// Kubeconfig args
NewUnversionedOption(Kubelet, "kubeconfig", "/etc/kubernetes/kubelet.conf"),
NewUnversionedOption(Kubelet, "bootstrap-kubeconfig", "/etc/kubernetes/bootstrap-kubelet.conf"),
NewUnversionedOption(Kubelet, "require-kubeconfig", "true"),
// System pods args
NewUnversionedOption(Kubelet, "pod-manifest-path", "/etc/kubernetes/manifests"),
NewUnversionedOption(Kubelet, "allow-privileged", "true"),
NewUnversionedOption(Kubelet, "cluster-dns", "10.0.0.10"),
// Network args
NewUnversionedOption(Kubelet, "cluster-dns", "10.96.0.10"),
NewUnversionedOption(Kubelet, "cluster-domain", "cluster.local"),
// Auth args
NewUnversionedOption(Kubelet, "authorization-mode", "Webhook"),
NewUnversionedOption(Kubelet, "client-ca-file", filepath.Join(util.DefaultCertPath, "ca.crt")),
// Cgroup args
NewUnversionedOption(Kubelet, "cadvisor-port", "0"),
NewUnversionedOption(Kubelet, "cgroup-driver", "cgroupfs"),
}
......
......@@ -151,11 +151,6 @@ const (
)
func GetKubernetesReleaseURL(binaryName, version string) string {
// TODO(r2d4): change this to official releases when the alpha controlplane commands are released.
// We are working with unreleased kubeadm changes at HEAD.
if binaryName == "kubeadm" {
return "https://storage.googleapis.com/minikube/kubeadm/kubeadm"
}
return fmt.Sprintf("https://storage.googleapis.com/kubernetes-release/release/%s/bin/linux/amd64/%s", version, binaryName)
}
......
......@@ -65,7 +65,7 @@ func testClusterDNS(t *testing.T) {
t.Fatalf("running nslookup in pod:%s", err)
}
dnsOutput := string(dnsByteArr)
if !strings.Contains(dnsOutput, "10.0.0.1") || !strings.Contains(dnsOutput, "10.0.0.10") {
t.Errorf("DNS lookup failed, could not find both 10.0.0.1 and 10.0.0.10. Output: %s", dnsOutput)
if !strings.Contains(dnsOutput, "Server") || !strings.Contains(dnsOutput, "Address 1") {
t.Errorf("DNS lookup failed, could not find dns server. Output: %s", dnsOutput)
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册