Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
e2dd95ed
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e2dd95ed
编写于
10月 17, 2017
作者:
M
Matt Rickard
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update kubeadm
上级
e68de40a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
8 deletion
+16
-8
pkg/minikube/bootstrapper/kubeadm/versions.go
pkg/minikube/bootstrapper/kubeadm/versions.go
+14
-1
pkg/minikube/constants/constants.go
pkg/minikube/constants/constants.go
+0
-5
test/integration/cluster_dns_test.go
test/integration/cluster_dns_test.go
+2
-2
未找到文件。
pkg/minikube/bootstrapper/kubeadm/versions.go
浏览文件 @
e2dd95ed
...
...
@@ -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"
),
}
...
...
pkg/minikube/constants/constants.go
浏览文件 @
e2dd95ed
...
...
@@ -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
)
}
...
...
test/integration/cluster_dns_test.go
浏览文件 @
e2dd95ed
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录