Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
cb621979
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,发现更多精彩内容 >>
未验证
提交
cb621979
编写于
4月 17, 2020
作者:
S
Sharif Elgamal
提交者:
GitHub
4月 17, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7700 from sharifelgamal/multi-vm
Fix multinode cluster creation for VM drivers
上级
6f09ab05
f8c1f05e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
86 addition
and
4 deletion
+86
-4
pkg/minikube/node/start.go
pkg/minikube/node/start.go
+16
-2
test/integration/multinode_test.go
test/integration/multinode_test.go
+68
-0
test/integration/util.go
test/integration/util.go
+2
-2
未找到文件。
pkg/minikube/node/start.go
浏览文件 @
cb621979
...
...
@@ -156,9 +156,23 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
return
nil
,
errors
.
Wrap
(
err
,
"Updating node"
)
}
cpBs
,
err
:=
cluster
.
Bootstrapper
(
starter
.
MachineAPI
,
viper
.
GetString
(
cmdcfg
.
Bootstrapper
),
*
starter
.
Cfg
,
starter
.
Runner
)
// Make sure to use the command runner for the control plane to generate the join token
cp
,
err
:=
config
.
PrimaryControlPlane
(
starter
.
Cfg
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrap
(
err
,
"Getting bootstrapper"
)
return
nil
,
errors
.
Wrap
(
err
,
"getting primary control plane"
)
}
h
,
err
:=
machine
.
LoadHost
(
starter
.
MachineAPI
,
driver
.
MachineName
(
*
starter
.
Cfg
,
cp
))
if
err
!=
nil
{
return
nil
,
errors
.
Wrap
(
err
,
"getting control plane host"
)
}
cpr
,
err
:=
machine
.
CommandRunner
(
h
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrap
(
err
,
"getting control plane command runner"
)
}
cpBs
,
err
:=
cluster
.
Bootstrapper
(
starter
.
MachineAPI
,
viper
.
GetString
(
cmdcfg
.
Bootstrapper
),
*
starter
.
Cfg
,
cpr
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrap
(
err
,
"getting control plane bootstrapper"
)
}
joinCmd
,
err
:=
cpBs
.
GenerateToken
(
*
starter
.
Cfg
)
...
...
test/integration/multinode_test.go
0 → 100644
浏览文件 @
cb621979
// +build integration
/*
Copyright 2020 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
integration
import
(
"context"
"os/exec"
"strings"
"testing"
)
func
TestMultiNode
(
t
*
testing
.
T
)
{
if
NoneDriver
()
{
t
.
Skip
(
"none driver does not support multinode"
)
}
// TODO: remove this skip once docker multinode is fixed
if
KicDriver
()
{
t
.
Skip
(
"docker driver multinode is currently broken :("
)
}
profile
:=
UniqueProfileName
(
"multinode"
)
ctx
,
cancel
:=
context
.
WithTimeout
(
context
.
Background
(),
Minutes
(
30
))
defer
CleanupWithLogs
(
t
,
profile
,
cancel
)
startArgs
:=
append
([]
string
{
"start"
,
"-p"
,
profile
,
"--wait=true"
},
StartArgs
()
...
)
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
startArgs
...
))
if
err
!=
nil
{
t
.
Fatalf
(
"failed to start cluster. args %q : %v"
,
rr
.
Command
(),
err
)
}
// Add a node to the current cluster
addArgs
:=
[]
string
{
"node"
,
"add"
,
"-p"
,
profile
,
"-v"
,
"3"
,
"--alsologtostderr"
}
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
addArgs
...
))
if
err
!=
nil
{
t
.
Fatalf
(
"failed to add node to current cluster. args %q : %v"
,
rr
.
Command
(),
err
)
}
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
"-p"
,
profile
,
"status"
))
if
err
!=
nil
{
t
.
Fatalf
(
"failed to run minikube status. args %q : %v"
,
rr
.
Command
(),
err
)
}
if
strings
.
Count
(
rr
.
Stdout
.
String
(),
"host: Running"
)
!=
2
{
t
.
Errorf
(
"status says both hosts are not running: args %q: %v"
,
rr
.
Command
(),
rr
.
Stdout
.
String
())
}
if
strings
.
Count
(
rr
.
Stdout
.
String
(),
"kubelet: Running"
)
!=
2
{
t
.
Errorf
(
"status says both kubelets are not running: args %q: %v"
,
rr
.
Command
(),
rr
.
Stdout
.
String
())
}
}
test/integration/util.go
浏览文件 @
cb621979
...
...
@@ -56,6 +56,6 @@ func UniqueProfileName(prefix string) string {
if
NoneDriver
()
{
return
"minikube"
}
// example: prefix-20200413
T
162239-3215
return
fmt
.
Sprintf
(
"%s-%s-%d"
,
prefix
,
time
.
Now
()
.
Format
(
"20060102
T
150405"
),
os
.
Getpid
())
// example: prefix-20200413162239-3215
return
fmt
.
Sprintf
(
"%s-%s-%d"
,
prefix
,
time
.
Now
()
.
Format
(
"20060102150405"
),
os
.
Getpid
())
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录