Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
afc991ad
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,发现更多精彩内容 >>
提交
afc991ad
编写于
10月 23, 2017
作者:
M
Matt Rickard
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix tests
上级
30667cb4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
11 deletion
+23
-11
pkg/localkube/localkube_test.go
pkg/localkube/localkube_test.go
+4
-3
pkg/localkube/ready_test.go
pkg/localkube/ready_test.go
+10
-1
pkg/minikube/bootstrapper/certs_test.go
pkg/minikube/bootstrapper/certs_test.go
+2
-0
pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go
pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go
+5
-5
test/integration/cluster_dns_test.go
test/integration/cluster_dns_test.go
+2
-2
未找到文件。
pkg/localkube/localkube_test.go
浏览文件 @
afc991ad
...
...
@@ -24,6 +24,7 @@ import (
"testing"
"k8s.io/minikube/pkg/minikube/tests"
"k8s.io/minikube/pkg/util"
)
var
testIPs
=
[]
net
.
IP
{
net
.
ParseIP
(
"1.2.3.4"
)}
...
...
@@ -33,7 +34,7 @@ func TestGenerateCerts(t *testing.T) {
defer
os
.
RemoveAll
(
tempDir
)
os
.
Mkdir
(
filepath
.
Join
(
tempDir
,
"certs"
),
0777
)
_
,
ipRange
,
_
:=
net
.
ParseCIDR
(
"10.0.0.0/24"
)
_
,
ipRange
,
_
:=
net
.
ParseCIDR
(
util
.
DefaultServiceCIDR
)
lk
:=
LocalkubeServer
{
LocalkubeDirectory
:
tempDir
,
ServiceClusterIPRange
:
*
ipRange
,
...
...
@@ -92,7 +93,7 @@ func TestShouldGenerateCertsMismatchedIP(t *testing.T) {
defer
os
.
RemoveAll
(
tempDir
)
os
.
Mkdir
(
filepath
.
Join
(
tempDir
,
"certs"
),
0777
)
_
,
ipRange
,
_
:=
net
.
ParseCIDR
(
"10.0.0.0/24"
)
_
,
ipRange
,
_
:=
net
.
ParseCIDR
(
util
.
DefaultServiceCIDR
)
lk
:=
LocalkubeServer
{
LocalkubeDirectory
:
tempDir
,
ServiceClusterIPRange
:
*
ipRange
,
...
...
@@ -110,7 +111,7 @@ func TestShouldNotGenerateCerts(t *testing.T) {
defer
os
.
RemoveAll
(
tempDir
)
os
.
Mkdir
(
filepath
.
Join
(
tempDir
,
"certs"
),
0777
)
_
,
ipRange
,
_
:=
net
.
ParseCIDR
(
"10.0.0.0/24"
)
_
,
ipRange
,
_
:=
net
.
ParseCIDR
(
util
.
DefaultServiceCIDR
)
lk
:=
LocalkubeServer
{
LocalkubeDirectory
:
tempDir
,
ServiceClusterIPRange
:
*
ipRange
,
...
...
pkg/localkube/ready_test.go
浏览文件 @
afc991ad
...
...
@@ -21,12 +21,14 @@ import (
"crypto/x509"
"io"
"io/ioutil"
"net"
"net/http"
"net/http/httptest"
"os"
"testing"
"k8s.io/minikube/pkg/minikube/tests"
"k8s.io/minikube/pkg/util"
)
func
TestBasicHealthCheck
(
t
*
testing
.
T
)
{
...
...
@@ -42,7 +44,14 @@ func TestBasicHealthCheck(t *testing.T) {
tempDir
:=
tests
.
MakeTempDir
()
defer
os
.
RemoveAll
(
tempDir
)
lk
:=
LocalkubeServer
{
LocalkubeDirectory
:
tempDir
}
_
,
ipnet
,
err
:=
net
.
ParseCIDR
(
util
.
DefaultServiceCIDR
)
if
err
!=
nil
{
t
.
Fatalf
(
"Error parsing default service cidr range: %s"
,
err
)
}
lk
:=
LocalkubeServer
{
LocalkubeDirectory
:
tempDir
,
ServiceClusterIPRange
:
*
ipnet
,
}
lk
.
GenerateCerts
()
cert
,
err
:=
tls
.
LoadX509KeyPair
(
lk
.
GetPublicKeyCertPath
(),
lk
.
GetPrivateKeyCertPath
())
...
...
pkg/minikube/bootstrapper/certs_test.go
浏览文件 @
afc991ad
...
...
@@ -23,6 +23,7 @@ import (
"k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/minikube/tests"
"k8s.io/minikube/pkg/util"
)
func
TestSetupCerts
(
t
*
testing
.
T
)
{
...
...
@@ -33,6 +34,7 @@ func TestSetupCerts(t *testing.T) {
k8s
:=
KubernetesConfig
{
APIServerName
:
constants
.
APIServerName
,
DNSDomain
:
constants
.
ClusterDNSDomain
,
ServiceCIDR
:
util
.
DefaultServiceCIDR
,
}
var
filesToBeTransferred
[]
string
...
...
pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go
浏览文件 @
afc991ad
...
...
@@ -45,7 +45,7 @@ api:
kubernetesVersion: v1.8.0
certificatesDir: /var/lib/localkube/certs/
networking:
serviceSubnet: 10.
0.0.0/24
serviceSubnet: 10.
96.0.0/12
etcd:
dataDir: /data
nodeName: minikube
...
...
@@ -83,7 +83,7 @@ api:
kubernetesVersion: v1.8.0-alpha.0
certificatesDir: /var/lib/localkube/certs/
networking:
serviceSubnet: 10.
0.0.0/24
serviceSubnet: 10.
96.0.0/12
etcd:
dataDir: /data
nodeName: extra-args-minikube
...
...
@@ -122,7 +122,7 @@ api:
kubernetesVersion: v1.8.0-alpha.0
certificatesDir: /var/lib/localkube/certs/
networking:
serviceSubnet: 10.
0.0.0/24
serviceSubnet: 10.
96.0.0/12
etcd:
dataDir: /data
nodeName: extra-args-minikube
...
...
@@ -147,7 +147,7 @@ api:
kubernetesVersion: v1.8.0-alpha.0
certificatesDir: /var/lib/localkube/certs/
networking:
serviceSubnet: 10.
0.0.0/24
serviceSubnet: 10.
96.0.0/12
etcd:
dataDir: /data
nodeName: extra-args-minikube
...
...
@@ -182,7 +182,7 @@ api:
kubernetesVersion: v1.8.0-alpha.0
certificatesDir: /var/lib/localkube/certs/
networking:
serviceSubnet: 10.
0.0.0/24
serviceSubnet: 10.
96.0.0/12
etcd:
dataDir: /data
nodeName: extra-args-minikube
...
...
test/integration/cluster_dns_test.go
浏览文件 @
afc991ad
...
...
@@ -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.96.0.1"
)
||
!
strings
.
Contains
(
dnsOutput
,
"10.
0
.0.10"
)
{
t
.
Errorf
(
"DNS lookup failed, could not find both 10.
0
6.0.1 and 10.96.0.10. Output: %s"
,
dnsOutput
)
if
!
strings
.
Contains
(
dnsOutput
,
"10.96.0.1"
)
||
!
strings
.
Contains
(
dnsOutput
,
"10.
96
.0.10"
)
{
t
.
Errorf
(
"DNS lookup failed, could not find both 10.
9
6.0.1 and 10.96.0.10. Output: %s"
,
dnsOutput
)
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录