Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
72e786f7
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,发现更多精彩内容 >>
提交
72e786f7
编写于
9月 01, 2020
作者:
T
Thomas Stromberg
浏览文件
操作
浏览文件
下载
差异文件
Merge to master
上级
51d1f209
2dac55ab
变更
81
隐藏空白更改
内联
并排
Showing
81 changed file
with
510 addition
and
374 deletion
+510
-374
cmd/minikube/cmd/start_flags.go
cmd/minikube/cmd/start_flags.go
+3
-1
deploy/addons/dashboard/dashboard-dp.yaml
deploy/addons/dashboard/dashboard-dp.yaml
+1
-1
deploy/addons/ingress/ingress-dp.yaml.tmpl
deploy/addons/ingress/ingress-dp.yaml.tmpl
+1
-1
pkg/addons/addons.go
pkg/addons/addons.go
+0
-1
pkg/addons/addons_test.go
pkg/addons/addons_test.go
+14
-1
pkg/drivers/kic/kic.go
pkg/drivers/kic/kic.go
+1
-0
pkg/drivers/kic/oci/network.go
pkg/drivers/kic/oci/network.go
+29
-1
pkg/drivers/kic/oci/types.go
pkg/drivers/kic/oci/types.go
+47
-0
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
+0
-6
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
+0
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
...otstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
...er/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
...nikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
...ootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
.../bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
...otstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
...er/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
...nikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
...ootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
.../bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
...otstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
...er/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
...nikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
...ootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
.../bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
...otstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
...er/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
...nikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
...ootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
.../bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
...otstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
...er/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
...nikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
...ootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
.../bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
...otstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
...er/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
...nikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
...ootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
.../bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
+6
-6
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
+2
-6
pkg/minikube/bootstrapper/bsutil/versions.go
pkg/minikube/bootstrapper/bsutil/versions.go
+16
-1
pkg/minikube/bootstrapper/images/images.go
pkg/minikube/bootstrapper/images/images.go
+1
-1
pkg/minikube/bootstrapper/images/images_test.go
pkg/minikube/bootstrapper/images/images_test.go
+2
-2
pkg/minikube/bootstrapper/images/kubeadm_test.go
pkg/minikube/bootstrapper/images/kubeadm_test.go
+6
-6
pkg/minikube/config/types.go
pkg/minikube/config/types.go
+1
-0
pkg/minikube/cruntime/containerd_test.go
pkg/minikube/cruntime/containerd_test.go
+1
-1
pkg/minikube/localpath/localpath_test.go
pkg/minikube/localpath/localpath_test.go
+2
-2
pkg/minikube/machine/cluster_test.go
pkg/minikube/machine/cluster_test.go
+36
-0
pkg/minikube/node/start.go
pkg/minikube/node/start.go
+4
-1
pkg/minikube/notify/notify.go
pkg/minikube/notify/notify.go
+2
-2
pkg/minikube/notify/notify_test.go
pkg/minikube/notify/notify_test.go
+1
-1
pkg/minikube/perf/start.go
pkg/minikube/perf/start.go
+22
-4
pkg/minikube/reason/known_issues.go
pkg/minikube/reason/known_issues.go
+11
-0
pkg/minikube/reason/reason.go
pkg/minikube/reason/reason.go
+1
-1
pkg/minikube/registry/drvs/docker/docker.go
pkg/minikube/registry/drvs/docker/docker.go
+10
-0
pkg/minikube/registry/drvs/podman/podman.go
pkg/minikube/registry/drvs/podman/podman.go
+10
-0
site/content/en/docs/drivers/includes/none_usage.inc
site/content/en/docs/drivers/includes/none_usage.inc
+12
-10
未找到文件。
cmd/minikube/cmd/start_flags.go
浏览文件 @
72e786f7
...
@@ -331,7 +331,9 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
...
@@ -331,7 +331,9 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
},
},
}
}
cc
.
VerifyComponents
=
interpretWaitFlag
(
*
cmd
)
cc
.
VerifyComponents
=
interpretWaitFlag
(
*
cmd
)
if
viper
.
GetBool
(
createMount
)
&&
driver
.
IsKIC
(
drvName
)
{
cc
.
ContainerVolumeMounts
=
[]
string
{
viper
.
GetString
(
mountString
)}
}
cnm
,
err
:=
cni
.
New
(
cc
)
cnm
,
err
:=
cni
.
New
(
cc
)
if
err
!=
nil
{
if
err
!=
nil
{
return
cc
,
config
.
Node
{},
errors
.
Wrap
(
err
,
"cni"
)
return
cc
,
config
.
Node
{},
errors
.
Wrap
(
err
,
"cni"
)
...
...
deploy/addons/dashboard/dashboard-dp.yaml
浏览文件 @
72e786f7
...
@@ -90,7 +90,7 @@ spec:
...
@@ -90,7 +90,7 @@ spec:
containers
:
containers
:
-
name
:
kubernetes-dashboard
-
name
:
kubernetes-dashboard
# WARNING: This must match pkg/minikube/bootstrapper/images/images.go
# WARNING: This must match pkg/minikube/bootstrapper/images/images.go
image
:
kubernetesui/dashboard:v2.0.
1
image
:
kubernetesui/dashboard:v2.0.
3
ports
:
ports
:
-
containerPort
:
9090
-
containerPort
:
9090
protocol
:
TCP
protocol
:
TCP
...
...
deploy/addons/ingress/ingress-dp.yaml.tmpl
浏览文件 @
72e786f7
...
@@ -48,7 +48,7 @@ spec:
...
@@ -48,7 +48,7 @@ spec:
serviceAccountName: ingress-nginx
serviceAccountName: ingress-nginx
containers:
containers:
- name: controller
- name: controller
image:
quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.33.
0
image:
us.gcr.io/k8s-artifacts-prod/ingress-nginx/controller:v0.34.1@sha256:0e072dddd1f7f8fc8909a2ca6f65e76c5f0d2fcfb8be47935ae3457e8bbceb2
0
imagePullPolicy: IfNotPresent
imagePullPolicy: IfNotPresent
lifecycle:
lifecycle:
preStop:
preStop:
...
...
pkg/addons/addons.go
浏览文件 @
72e786f7
...
@@ -353,7 +353,6 @@ func verifyAddonStatusInternal(cc *config.ClusterConfig, name string, val string
...
@@ -353,7 +353,6 @@ func verifyAddonStatusInternal(cc *config.ClusterConfig, name string, val string
// Start enables the default addons for a profile, plus any additional
// Start enables the default addons for a profile, plus any additional
func
Start
(
wg
*
sync
.
WaitGroup
,
cc
*
config
.
ClusterConfig
,
toEnable
map
[
string
]
bool
,
additional
[]
string
)
{
func
Start
(
wg
*
sync
.
WaitGroup
,
cc
*
config
.
ClusterConfig
,
toEnable
map
[
string
]
bool
,
additional
[]
string
)
{
wg
.
Add
(
1
)
defer
wg
.
Done
()
defer
wg
.
Done
()
start
:=
time
.
Now
()
start
:=
time
.
Now
()
...
...
pkg/addons/addons_test.go
浏览文件 @
72e786f7
...
@@ -26,6 +26,7 @@ import (
...
@@ -26,6 +26,7 @@ import (
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/localpath"
"k8s.io/minikube/pkg/minikube/localpath"
"k8s.io/minikube/pkg/minikube/tests"
)
)
func
createTestProfile
(
t
*
testing
.
T
)
string
{
func
createTestProfile
(
t
*
testing
.
T
)
string
{
...
@@ -35,6 +36,13 @@ func createTestProfile(t *testing.T) string {
...
@@ -35,6 +36,13 @@ func createTestProfile(t *testing.T) string {
t
.
Fatalf
(
"tempdir: %v"
,
err
)
t
.
Fatalf
(
"tempdir: %v"
,
err
)
}
}
t
.
Cleanup
(
func
()
{
err
:=
os
.
RemoveAll
(
td
)
t
.
Logf
(
"remove path %q"
,
td
)
if
err
!=
nil
{
t
.
Errorf
(
"failed to clean up temp folder %q"
,
td
)
}
})
err
=
os
.
Setenv
(
localpath
.
MinikubeHome
,
td
)
err
=
os
.
Setenv
(
localpath
.
MinikubeHome
,
td
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Errorf
(
"error setting up test environment. could not set %s"
,
localpath
.
MinikubeHome
)
t
.
Errorf
(
"error setting up test environment. could not set %s"
,
localpath
.
MinikubeHome
)
...
@@ -122,6 +130,10 @@ func TestSetAndSave(t *testing.T) {
...
@@ -122,6 +130,10 @@ func TestSetAndSave(t *testing.T) {
}
}
func
TestStart
(
t
*
testing
.
T
)
{
func
TestStart
(
t
*
testing
.
T
)
{
// this test will write a config.json into MinikubeHome, create a temp dir for it
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
cc
:=
&
config
.
ClusterConfig
{
cc
:=
&
config
.
ClusterConfig
{
Name
:
"start"
,
Name
:
"start"
,
CPUs
:
2
,
CPUs
:
2
,
...
@@ -130,7 +142,8 @@ func TestStart(t *testing.T) {
...
@@ -130,7 +142,8 @@ func TestStart(t *testing.T) {
}
}
var
wg
sync
.
WaitGroup
var
wg
sync
.
WaitGroup
Start
(
&
wg
,
cc
,
map
[
string
]
bool
{},
[]
string
{
"dashboard"
})
wg
.
Add
(
1
)
go
Start
(
&
wg
,
cc
,
map
[
string
]
bool
{},
[]
string
{
"dashboard"
})
wg
.
Wait
()
wg
.
Wait
()
if
!
assets
.
Addons
[
"dashboard"
]
.
IsEnabled
(
cc
)
{
if
!
assets
.
Addons
[
"dashboard"
]
.
IsEnabled
(
cc
)
{
...
...
pkg/drivers/kic/kic.go
浏览文件 @
72e786f7
...
@@ -68,6 +68,7 @@ func NewDriver(c Config) *Driver {
...
@@ -68,6 +68,7 @@ func NewDriver(c Config) *Driver {
// Create a host using the driver's config
// Create a host using the driver's config
func
(
d
*
Driver
)
Create
()
error
{
func
(
d
*
Driver
)
Create
()
error
{
params
:=
oci
.
CreateParams
{
params
:=
oci
.
CreateParams
{
Mounts
:
d
.
NodeConfig
.
Mounts
,
Name
:
d
.
NodeConfig
.
MachineName
,
Name
:
d
.
NodeConfig
.
MachineName
,
Image
:
d
.
NodeConfig
.
ImageDigest
,
Image
:
d
.
NodeConfig
.
ImageDigest
,
ClusterLabel
:
oci
.
ProfileLabelKey
+
"="
+
d
.
MachineName
,
ClusterLabel
:
oci
.
ProfileLabelKey
+
"="
+
d
.
MachineName
,
...
...
pkg/drivers/kic/oci/network.go
浏览文件 @
72e786f7
...
@@ -58,9 +58,20 @@ func digDNS(ociBin, containerName, dns string) (net.IP, error) {
...
@@ -58,9 +58,20 @@ func digDNS(ociBin, containerName, dns string) (net.IP, error) {
return
ip
,
nil
return
ip
,
nil
}
}
// profileInContainers checks whether the profile is within the containers list
func
profileInContainers
(
profile
string
,
containers
[]
string
)
bool
{
for
_
,
container
:=
range
containers
{
if
container
==
profile
{
return
true
}
}
return
false
}
// dockerGatewayIP gets the default gateway ip for the docker bridge on the user's host machine
// dockerGatewayIP gets the default gateway ip for the docker bridge on the user's host machine
// gets the ip from user's host docker
// gets the ip from user's host docker
func
dockerGatewayIP
(
profile
string
)
(
net
.
IP
,
error
)
{
func
dockerGatewayIP
(
profile
string
)
(
net
.
IP
,
error
)
{
var
bridgeID
string
// check if using custom network first
// check if using custom network first
if
networkExists
(
profile
)
{
if
networkExists
(
profile
)
{
ip
:=
net
.
ParseIP
(
DefaultGateway
)
ip
:=
net
.
ParseIP
(
DefaultGateway
)
...
@@ -70,8 +81,25 @@ func dockerGatewayIP(profile string) (net.IP, error) {
...
@@ -70,8 +81,25 @@ func dockerGatewayIP(profile string) (net.IP, error) {
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"get network bridge"
)
return
nil
,
errors
.
Wrapf
(
err
,
"get network bridge"
)
}
}
networksOutput
:=
strings
.
TrimSpace
(
rr
.
Stdout
.
String
())
networksSlice
:=
strings
.
Fields
(
networksOutput
)
// Look for the minikube container within each docker network
for
_
,
net
:=
range
networksSlice
{
// get all containers in the network
rs
,
err
:=
runCmd
(
exec
.
Command
(
Docker
,
"network"
,
"inspect"
,
net
,
"-f"
,
"{{range $k, $v := .Containers}}{{$v.Name}} {{end}}"
))
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"get containers in network"
)
}
containersSlice
:=
strings
.
Fields
(
rs
.
Stdout
.
String
())
if
profileInContainers
(
profile
,
containersSlice
)
{
bridgeID
=
net
break
}
}
bridgeID
:=
strings
.
TrimSpace
(
rr
.
Stdout
.
String
())
if
bridgeID
==
""
{
return
nil
,
errors
.
Errorf
(
"unable to determine bridge network id from %q"
,
networksOutput
)
}
rr
,
err
=
runCmd
(
exec
.
Command
(
Docker
,
"network"
,
"inspect"
,
rr
,
err
=
runCmd
(
exec
.
Command
(
Docker
,
"network"
,
"inspect"
,
"--format"
,
"{{(index .IPAM.Config 0).Gateway}}"
,
bridgeID
))
"--format"
,
"{{(index .IPAM.Config 0).Gateway}}"
,
bridgeID
))
if
err
!=
nil
{
if
err
!=
nil
{
...
...
pkg/drivers/kic/oci/types.go
浏览文件 @
72e786f7
...
@@ -16,6 +16,13 @@ limitations under the License.
...
@@ -16,6 +16,13 @@ limitations under the License.
package
oci
package
oci
import
(
"errors"
"fmt"
"path/filepath"
"strings"
)
const
(
const
(
// DefaultBindIPV4 is The default IP the container will listen on.
// DefaultBindIPV4 is The default IP the container will listen on.
DefaultBindIPV4
=
"127.0.0.1"
DefaultBindIPV4
=
"127.0.0.1"
...
@@ -102,6 +109,46 @@ type Mount struct {
...
@@ -102,6 +109,46 @@ type Mount struct {
Propagation
MountPropagation
`protobuf:"varint,5,opt,name=propagation,proto3,enum=runtime.v1alpha2.MountPropagation" json:"propagation,omitempty"`
Propagation
MountPropagation
`protobuf:"varint,5,opt,name=propagation,proto3,enum=runtime.v1alpha2.MountPropagation" json:"propagation,omitempty"`
}
}
// ParseMountString parses a mount string of format:
// '[host-path:]container-path[:<options>]' The comma-delimited 'options' are
// [rw|ro], [Z], [srhared|rslave|rprivate].
func
ParseMountString
(
spec
string
)
(
m
Mount
,
err
error
)
{
switch
fields
:=
strings
.
Split
(
spec
,
":"
);
len
(
fields
)
{
case
0
:
err
=
errors
.
New
(
"invalid empty spec"
)
case
1
:
m
.
ContainerPath
=
fields
[
0
]
case
3
:
for
_
,
opt
:=
range
strings
.
Split
(
fields
[
2
],
","
)
{
switch
opt
{
case
"Z"
:
m
.
SelinuxRelabel
=
true
case
"ro"
:
m
.
Readonly
=
true
case
"rw"
:
m
.
Readonly
=
false
case
"rslave"
:
m
.
Propagation
=
MountPropagationHostToContainer
case
"rshared"
:
m
.
Propagation
=
MountPropagationBidirectional
case
"private"
:
m
.
Propagation
=
MountPropagationNone
default
:
err
=
fmt
.
Errorf
(
"unknown mount option: '%s'"
,
opt
)
}
}
fallthrough
case
2
:
m
.
HostPath
,
m
.
ContainerPath
=
fields
[
0
],
fields
[
1
]
if
!
filepath
.
IsAbs
(
m
.
ContainerPath
)
{
err
=
fmt
.
Errorf
(
"'%s' container path must be absolute"
,
m
.
ContainerPath
)
}
default
:
err
=
errors
.
New
(
"spec must be in form: <host path>:<container path>[:<options>]"
)
}
return
m
,
err
}
// PortMapping specifies a host port mapped into a container port.
// PortMapping specifies a host port mapped into a container port.
// In yaml this looks like:
// In yaml this looks like:
// containerPort: 80
// containerPort: 80
...
...
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
浏览文件 @
72e786f7
...
@@ -65,12 +65,6 @@ etcd:
...
@@ -65,12 +65,6 @@ etcd:
dataDir: {{.EtcdDataDir}}
dataDir: {{.EtcdDataDir}}
extraArgs:
extraArgs:
listen-metrics-urls: http://127.0.0.1:2381,http://{{.AdvertiseAddress}}:2381
listen-metrics-urls: http://127.0.0.1:2381,http://{{.AdvertiseAddress}}:2381
controllerManager:
extraArgs:
"leader-elect": "false"
scheduler:
extraArgs:
"leader-elect": "false"
kubernetesVersion: {{.KubernetesVersion}}
kubernetesVersion: {{.KubernetesVersion}}
networking:
networking:
dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}
dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}
...
...
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
浏览文件 @
72e786f7
...
@@ -68,12 +68,6 @@ etcd:
...
@@ -68,12 +68,6 @@ etcd:
{{- range $i, $val := printMapInOrder .EtcdExtraArgs ": " }}
{{- range $i, $val := printMapInOrder .EtcdExtraArgs ": " }}
{{$val}}
{{$val}}
{{- end}}
{{- end}}
controllerManager:
extraArgs:
"leader-elect": "false"
scheduler:
extraArgs:
"leader-elect": "false"
kubernetesVersion: {{.KubernetesVersion}}
kubernetesVersion: {{.KubernetesVersion}}
networking:
networking:
dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}
dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.14.0
kubernetesVersion
:
v1.14.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.14.0
kubernetesVersion
:
v1.14.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.14.0
kubernetesVersion
:
v1.14.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml
浏览文件 @
72e786f7
...
@@ -29,9 +29,11 @@ controllerManager:
...
@@ -29,9 +29,11 @@ controllerManager:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -43,12 +45,6 @@ etcd:
...
@@ -43,12 +45,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.14.0
kubernetesVersion
:
v1.14.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.14.0
kubernetesVersion
:
v1.14.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.14.0
kubernetesVersion
:
v1.14.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.14.0
kubernetesVersion
:
v1.14.0
networking
:
networking
:
dnsDomain
:
1.1.1.1
dnsDomain
:
1.1.1.1
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml
浏览文件 @
72e786f7
...
@@ -24,6 +24,12 @@ apiServer:
...
@@ -24,6 +24,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -34,12 +40,6 @@ etcd:
...
@@ -34,12 +40,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.14.0
kubernetesVersion
:
v1.14.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml
浏览文件 @
72e786f7
...
@@ -27,8 +27,10 @@ apiServer:
...
@@ -27,8 +27,10 @@ apiServer:
controllerManager
:
controllerManager
:
extraArgs
:
extraArgs
:
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -40,12 +42,6 @@ etcd:
...
@@ -40,12 +42,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.14.0
kubernetesVersion
:
v1.14.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.15.0
kubernetesVersion
:
v1.15.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.15.0
kubernetesVersion
:
v1.15.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.15.0
kubernetesVersion
:
v1.15.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml
浏览文件 @
72e786f7
...
@@ -29,9 +29,11 @@ controllerManager:
...
@@ -29,9 +29,11 @@ controllerManager:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -43,12 +45,6 @@ etcd:
...
@@ -43,12 +45,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.15.0
kubernetesVersion
:
v1.15.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.15.0
kubernetesVersion
:
v1.15.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.15.0
kubernetesVersion
:
v1.15.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.15.0
kubernetesVersion
:
v1.15.0
networking
:
networking
:
dnsDomain
:
1.1.1.1
dnsDomain
:
1.1.1.1
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml
浏览文件 @
72e786f7
...
@@ -24,6 +24,12 @@ apiServer:
...
@@ -24,6 +24,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -34,12 +40,6 @@ etcd:
...
@@ -34,12 +40,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.15.0
kubernetesVersion
:
v1.15.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml
浏览文件 @
72e786f7
...
@@ -27,8 +27,10 @@ apiServer:
...
@@ -27,8 +27,10 @@ apiServer:
controllerManager
:
controllerManager
:
extraArgs
:
extraArgs
:
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -40,12 +42,6 @@ etcd:
...
@@ -40,12 +42,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.15.0
kubernetesVersion
:
v1.15.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.16.0
kubernetesVersion
:
v1.16.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.16.0
kubernetesVersion
:
v1.16.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.16.0
kubernetesVersion
:
v1.16.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml
浏览文件 @
72e786f7
...
@@ -29,9 +29,11 @@ controllerManager:
...
@@ -29,9 +29,11 @@ controllerManager:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -43,12 +45,6 @@ etcd:
...
@@ -43,12 +45,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.16.0
kubernetesVersion
:
v1.16.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.16.0
kubernetesVersion
:
v1.16.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.16.0
kubernetesVersion
:
v1.16.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.16.0
kubernetesVersion
:
v1.16.0
networking
:
networking
:
dnsDomain
:
1.1.1.1
dnsDomain
:
1.1.1.1
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml
浏览文件 @
72e786f7
...
@@ -24,6 +24,12 @@ apiServer:
...
@@ -24,6 +24,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -34,12 +40,6 @@ etcd:
...
@@ -34,12 +40,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.16.0
kubernetesVersion
:
v1.16.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml
浏览文件 @
72e786f7
...
@@ -27,8 +27,10 @@ apiServer:
...
@@ -27,8 +27,10 @@ apiServer:
controllerManager
:
controllerManager
:
extraArgs
:
extraArgs
:
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -40,12 +42,6 @@ etcd:
...
@@ -40,12 +42,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
listen-metrics-urls
:
http://127.0.0.1:2381,http://1.1.1.1:2381
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.16.0
kubernetesVersion
:
v1.16.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.17.0
kubernetesVersion
:
v1.17.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.17.0
kubernetesVersion
:
v1.17.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.17.0
kubernetesVersion
:
v1.17.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
浏览文件 @
72e786f7
...
@@ -29,9 +29,11 @@ controllerManager:
...
@@ -29,9 +29,11 @@ controllerManager:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -43,12 +45,6 @@ etcd:
...
@@ -43,12 +45,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.17.0
kubernetesVersion
:
v1.17.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.17.0
kubernetesVersion
:
v1.17.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.17.0
kubernetesVersion
:
v1.17.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.17.0
kubernetesVersion
:
v1.17.0
networking
:
networking
:
dnsDomain
:
1.1.1.1
dnsDomain
:
1.1.1.1
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
浏览文件 @
72e786f7
...
@@ -24,6 +24,12 @@ apiServer:
...
@@ -24,6 +24,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -34,12 +40,6 @@ etcd:
...
@@ -34,12 +40,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.17.0
kubernetesVersion
:
v1.17.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
浏览文件 @
72e786f7
...
@@ -27,8 +27,10 @@ apiServer:
...
@@ -27,8 +27,10 @@ apiServer:
controllerManager
:
controllerManager
:
extraArgs
:
extraArgs
:
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -40,12 +42,6 @@ etcd:
...
@@ -40,12 +42,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.17.0
kubernetesVersion
:
v1.17.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.18.0
kubernetesVersion
:
v1.18.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.18.0
kubernetesVersion
:
v1.18.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.18.0
kubernetesVersion
:
v1.18.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
浏览文件 @
72e786f7
...
@@ -29,9 +29,11 @@ controllerManager:
...
@@ -29,9 +29,11 @@ controllerManager:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -43,12 +45,6 @@ etcd:
...
@@ -43,12 +45,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.18.0
kubernetesVersion
:
v1.18.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.18.0
kubernetesVersion
:
v1.18.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.18.0
kubernetesVersion
:
v1.18.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.18.0
kubernetesVersion
:
v1.18.0
networking
:
networking
:
dnsDomain
:
1.1.1.1
dnsDomain
:
1.1.1.1
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
浏览文件 @
72e786f7
...
@@ -24,6 +24,12 @@ apiServer:
...
@@ -24,6 +24,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -34,12 +40,6 @@ etcd:
...
@@ -34,12 +40,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.18.0
kubernetesVersion
:
v1.18.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
浏览文件 @
72e786f7
...
@@ -27,8 +27,10 @@ apiServer:
...
@@ -27,8 +27,10 @@ apiServer:
controllerManager
:
controllerManager
:
extraArgs
:
extraArgs
:
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -40,12 +42,6 @@ etcd:
...
@@ -40,12 +42,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.18.0
kubernetesVersion
:
v1.18.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
controlPlaneEndpoint
:
control-plane.minikube.internal:12345
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.19.0
kubernetesVersion
:
v1.19.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.19.0
kubernetesVersion
:
v1.19.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.19.0
kubernetesVersion
:
v1.19.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
浏览文件 @
72e786f7
...
@@ -29,9 +29,11 @@ controllerManager:
...
@@ -29,9 +29,11 @@ controllerManager:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
feature-gates
:
"
a=b"
feature-gates
:
"
a=b"
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -43,12 +45,6 @@ etcd:
...
@@ -43,12 +45,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.19.0
kubernetesVersion
:
v1.19.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.19.0
kubernetesVersion
:
v1.19.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.19.0
kubernetesVersion
:
v1.19.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
浏览文件 @
72e786f7
...
@@ -23,6 +23,12 @@ apiServer:
...
@@ -23,6 +23,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -33,12 +39,6 @@ etcd:
...
@@ -33,12 +39,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.19.0
kubernetesVersion
:
v1.19.0
networking
:
networking
:
dnsDomain
:
1.1.1.1
dnsDomain
:
1.1.1.1
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
浏览文件 @
72e786f7
...
@@ -24,6 +24,12 @@ apiServer:
...
@@ -24,6 +24,12 @@ apiServer:
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
certSANs
:
[
"
127.0.0.1"
,
"
localhost"
,
"
1.1.1.1"
]
extraArgs
:
extraArgs
:
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
enable-admission-plugins
:
"
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
controllerManager
:
extraArgs
:
leader-elect
:
"
false"
scheduler
:
extraArgs
:
leader-elect
:
"
false"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
controlPlaneEndpoint
:
control-plane.minikube.internal:8443
...
@@ -34,12 +40,6 @@ etcd:
...
@@ -34,12 +40,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.19.0
kubernetesVersion
:
v1.19.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
浏览文件 @
72e786f7
...
@@ -27,8 +27,10 @@ apiServer:
...
@@ -27,8 +27,10 @@ apiServer:
controllerManager
:
controllerManager
:
extraArgs
:
extraArgs
:
kube-api-burst
:
"
32"
kube-api-burst
:
"
32"
leader-elect
:
"
false"
scheduler
:
scheduler
:
extraArgs
:
extraArgs
:
leader-elect
:
"
false"
scheduler-name
:
"
mini-scheduler"
scheduler-name
:
"
mini-scheduler"
certificatesDir
:
/var/lib/minikube/certs
certificatesDir
:
/var/lib/minikube/certs
clusterName
:
mk
clusterName
:
mk
...
@@ -40,12 +42,6 @@ etcd:
...
@@ -40,12 +42,6 @@ etcd:
dataDir
:
/var/lib/minikube/etcd
dataDir
:
/var/lib/minikube/etcd
extraArgs
:
extraArgs
:
proxy-refresh-interval
:
"
70000"
proxy-refresh-interval
:
"
70000"
controllerManager
:
extraArgs
:
"
leader-elect"
:
"
false"
scheduler
:
extraArgs
:
"
leader-elect"
:
"
false"
kubernetesVersion
:
v1.19.0
kubernetesVersion
:
v1.19.0
networking
:
networking
:
dnsDomain
:
cluster.local
dnsDomain
:
cluster.local
...
...
pkg/minikube/bootstrapper/bsutil/versions.go
浏览文件 @
72e786f7
...
@@ -89,7 +89,6 @@ var versionSpecificOpts = []config.VersionedExtraOption{
...
@@ -89,7 +89,6 @@ var versionSpecificOpts = []config.VersionedExtraOption{
},
},
GreaterThanOrEqual
:
semver
.
MustParse
(
"1.14.0-alpha.0"
),
GreaterThanOrEqual
:
semver
.
MustParse
(
"1.14.0-alpha.0"
),
},
},
{
{
Option
:
config
.
ExtraOption
{
Option
:
config
.
ExtraOption
{
Component
:
Kubelet
,
Component
:
Kubelet
,
...
@@ -98,4 +97,20 @@ var versionSpecificOpts = []config.VersionedExtraOption{
...
@@ -98,4 +97,20 @@ var versionSpecificOpts = []config.VersionedExtraOption{
},
},
LessThanOrEqual
:
semver
.
MustParse
(
"1.11.1000"
),
LessThanOrEqual
:
semver
.
MustParse
(
"1.11.1000"
),
},
},
{
Option
:
config
.
ExtraOption
{
Component
:
ControllerManager
,
Key
:
"leader-elect"
,
Value
:
"false"
,
},
GreaterThanOrEqual
:
semver
.
MustParse
(
"1.14.0"
),
},
{
Option
:
config
.
ExtraOption
{
Component
:
Scheduler
,
Key
:
"leader-elect"
,
Value
:
"false"
,
},
GreaterThanOrEqual
:
semver
.
MustParse
(
"1.14.0"
),
},
}
}
pkg/minikube/bootstrapper/images/images.go
浏览文件 @
72e786f7
...
@@ -141,7 +141,7 @@ func dashboardFrontend(repo string) string {
...
@@ -141,7 +141,7 @@ func dashboardFrontend(repo string) string {
repo
=
"kubernetesui"
repo
=
"kubernetesui"
}
}
// See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml
// See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml
return
path
.
Join
(
repo
,
"dashboard:v2.0.
1
"
)
return
path
.
Join
(
repo
,
"dashboard:v2.0.
3
"
)
}
}
// dashboardMetrics returns the image used for the dashboard metrics scraper
// dashboardMetrics returns the image used for the dashboard metrics scraper
...
...
pkg/minikube/bootstrapper/images/images_test.go
浏览文件 @
72e786f7
...
@@ -25,7 +25,7 @@ import (
...
@@ -25,7 +25,7 @@ import (
func
TestAuxiliary
(
t
*
testing
.
T
)
{
func
TestAuxiliary
(
t
*
testing
.
T
)
{
want
:=
[]
string
{
want
:=
[]
string
{
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"kubernetesui/dashboard:v2.0.
1
"
,
"kubernetesui/dashboard:v2.0.
3
"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
}
}
got
:=
auxiliary
(
""
)
got
:=
auxiliary
(
""
)
...
@@ -37,7 +37,7 @@ func TestAuxiliary(t *testing.T) {
...
@@ -37,7 +37,7 @@ func TestAuxiliary(t *testing.T) {
func
TestAuxiliaryMirror
(
t
*
testing
.
T
)
{
func
TestAuxiliaryMirror
(
t
*
testing
.
T
)
{
want
:=
[]
string
{
want
:=
[]
string
{
"test.mirror/storage-provisioner:v3"
,
"test.mirror/storage-provisioner:v3"
,
"test.mirror/dashboard:v2.0.
1
"
,
"test.mirror/dashboard:v2.0.
3
"
,
"test.mirror/metrics-scraper:v1.0.4"
,
"test.mirror/metrics-scraper:v1.0.4"
,
}
}
got
:=
auxiliary
(
"test.mirror"
)
got
:=
auxiliary
(
"test.mirror"
)
...
...
pkg/minikube/bootstrapper/images/kubeadm_test.go
浏览文件 @
72e786f7
...
@@ -38,7 +38,7 @@ func TestKubeadmImages(t *testing.T) {
...
@@ -38,7 +38,7 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/etcd:3.4.3-0"
,
"k8s.gcr.io/etcd:3.4.3-0"
,
"k8s.gcr.io/pause:3.1"
,
"k8s.gcr.io/pause:3.1"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"kubernetesui/dashboard:v2.0.
1
"
,
"kubernetesui/dashboard:v2.0.
3
"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
}},
}},
{
"v1.16.1"
,
"mirror.k8s.io"
,
[]
string
{
{
"v1.16.1"
,
"mirror.k8s.io"
,
[]
string
{
...
@@ -50,7 +50,7 @@ func TestKubeadmImages(t *testing.T) {
...
@@ -50,7 +50,7 @@ func TestKubeadmImages(t *testing.T) {
"mirror.k8s.io/etcd:3.3.15-0"
,
"mirror.k8s.io/etcd:3.3.15-0"
,
"mirror.k8s.io/pause:3.1"
,
"mirror.k8s.io/pause:3.1"
,
"mirror.k8s.io/storage-provisioner:v3"
,
"mirror.k8s.io/storage-provisioner:v3"
,
"mirror.k8s.io/dashboard:v2.0.
1
"
,
"mirror.k8s.io/dashboard:v2.0.
3
"
,
"mirror.k8s.io/metrics-scraper:v1.0.4"
,
"mirror.k8s.io/metrics-scraper:v1.0.4"
,
}},
}},
{
"v1.15.0"
,
""
,
[]
string
{
{
"v1.15.0"
,
""
,
[]
string
{
...
@@ -62,7 +62,7 @@ func TestKubeadmImages(t *testing.T) {
...
@@ -62,7 +62,7 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/etcd:3.3.10"
,
"k8s.gcr.io/etcd:3.3.10"
,
"k8s.gcr.io/pause:3.1"
,
"k8s.gcr.io/pause:3.1"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"kubernetesui/dashboard:v2.0.
1
"
,
"kubernetesui/dashboard:v2.0.
3
"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
}},
}},
{
"v1.14.0"
,
""
,
[]
string
{
{
"v1.14.0"
,
""
,
[]
string
{
...
@@ -74,7 +74,7 @@ func TestKubeadmImages(t *testing.T) {
...
@@ -74,7 +74,7 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/etcd:3.3.10"
,
"k8s.gcr.io/etcd:3.3.10"
,
"k8s.gcr.io/pause:3.1"
,
"k8s.gcr.io/pause:3.1"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"kubernetesui/dashboard:v2.0.
1
"
,
"kubernetesui/dashboard:v2.0.
3
"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
}},
}},
{
"v1.13.0"
,
""
,
[]
string
{
{
"v1.13.0"
,
""
,
[]
string
{
...
@@ -86,7 +86,7 @@ func TestKubeadmImages(t *testing.T) {
...
@@ -86,7 +86,7 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/etcd:3.2.24"
,
"k8s.gcr.io/etcd:3.2.24"
,
"k8s.gcr.io/pause:3.1"
,
"k8s.gcr.io/pause:3.1"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"kubernetesui/dashboard:v2.0.
1
"
,
"kubernetesui/dashboard:v2.0.
3
"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
}},
}},
{
"v1.12.0"
,
""
,
[]
string
{
{
"v1.12.0"
,
""
,
[]
string
{
...
@@ -98,7 +98,7 @@ func TestKubeadmImages(t *testing.T) {
...
@@ -98,7 +98,7 @@ func TestKubeadmImages(t *testing.T) {
"k8s.gcr.io/etcd:3.2.24"
,
"k8s.gcr.io/etcd:3.2.24"
,
"k8s.gcr.io/pause:3.1"
,
"k8s.gcr.io/pause:3.1"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"kubernetesui/dashboard:v2.0.
1
"
,
"kubernetesui/dashboard:v2.0.
3
"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
"kubernetesui/metrics-scraper:v1.0.4"
,
}},
}},
}
}
...
...
pkg/minikube/config/types.go
浏览文件 @
72e786f7
...
@@ -45,6 +45,7 @@ type ClusterConfig struct {
...
@@ -45,6 +45,7 @@ type ClusterConfig struct {
HyperkitVpnKitSock
string
// Only used by the Hyperkit driver
HyperkitVpnKitSock
string
// Only used by the Hyperkit driver
HyperkitVSockPorts
[]
string
// Only used by the Hyperkit driver
HyperkitVSockPorts
[]
string
// Only used by the Hyperkit driver
DockerEnv
[]
string
// Each entry is formatted as KEY=VALUE.
DockerEnv
[]
string
// Each entry is formatted as KEY=VALUE.
ContainerVolumeMounts
[]
string
// Only used by container drivers: Docker, Podman
InsecureRegistry
[]
string
InsecureRegistry
[]
string
RegistryMirror
[]
string
RegistryMirror
[]
string
HostOnlyCIDR
string
// Only used by the virtualbox driver
HostOnlyCIDR
string
// Only used by the virtualbox driver
...
...
pkg/minikube/cruntime/containerd_test.go
浏览文件 @
72e786f7
...
@@ -25,7 +25,7 @@ func TestAddRepoTagToImageName(t *testing.T) {
...
@@ -25,7 +25,7 @@ func TestAddRepoTagToImageName(t *testing.T) {
imgName
string
imgName
string
want
string
want
string
}{
}{
{
"kubernetesui/dashboard:v2.0.
1"
,
"docker.io/kubernetesui/dashboard:v2.0.1
"
},
{
"kubernetesui/dashboard:v2.0.
3"
,
"docker.io/kubernetesui/dashboard:v2.0.3
"
},
{
"kubernetesui/metrics-scraper:v1.0.4"
,
"docker.io/kubernetesui/metrics-scraper:v1.0.4"
},
{
"kubernetesui/metrics-scraper:v1.0.4"
,
"docker.io/kubernetesui/metrics-scraper:v1.0.4"
},
{
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
},
{
"gcr.io/k8s-minikube/storage-provisioner:v3"
,
"gcr.io/k8s-minikube/storage-provisioner:v3"
},
}
}
...
...
pkg/minikube/localpath/localpath_test.go
浏览文件 @
72e786f7
...
@@ -33,12 +33,12 @@ func TestReplaceWinDriveLetterToVolumeName(t *testing.T) {
...
@@ -33,12 +33,12 @@ func TestReplaceWinDriveLetterToVolumeName(t *testing.T) {
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Error make tmp directory: %v"
,
err
)
t
.
Fatalf
(
"Error make tmp directory: %v"
,
err
)
}
}
defer
func
()
{
//clean up tempdir
defer
func
(
path
string
)
{
//clean up tempdir
err
:=
os
.
RemoveAll
(
path
)
err
:=
os
.
RemoveAll
(
path
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Errorf
(
"failed to clean up temp folder %q"
,
path
)
t
.
Errorf
(
"failed to clean up temp folder %q"
,
path
)
}
}
}()
}(
path
)
if
runtime
.
GOOS
!=
"windows"
{
if
runtime
.
GOOS
!=
"windows"
{
// Replace to fake func.
// Replace to fake func.
...
...
pkg/minikube/machine/cluster_test.go
浏览文件 @
72e786f7
...
@@ -70,6 +70,9 @@ var defaultClusterConfig = config.ClusterConfig{
...
@@ -70,6 +70,9 @@ var defaultClusterConfig = config.ClusterConfig{
}
}
func
TestCreateHost
(
t
*
testing
.
T
)
{
func
TestCreateHost
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
download
.
EnableMock
(
true
)
download
.
EnableMock
(
true
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
...
@@ -115,6 +118,9 @@ func TestCreateHost(t *testing.T) {
...
@@ -115,6 +118,9 @@ func TestCreateHost(t *testing.T) {
}
}
func
TestStartHostExists
(
t
*
testing
.
T
)
{
func
TestStartHostExists
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
download
.
EnableMock
(
true
)
download
.
EnableMock
(
true
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
...
@@ -154,6 +160,9 @@ func TestStartHostExists(t *testing.T) {
...
@@ -154,6 +160,9 @@ func TestStartHostExists(t *testing.T) {
}
}
func
TestStartHostErrMachineNotExist
(
t
*
testing
.
T
)
{
func
TestStartHostErrMachineNotExist
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
download
.
EnableMock
(
true
)
download
.
EnableMock
(
true
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
...
@@ -201,6 +210,9 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
...
@@ -201,6 +210,9 @@ func TestStartHostErrMachineNotExist(t *testing.T) {
}
}
func
TestStartStoppedHost
(
t
*
testing
.
T
)
{
func
TestStartStoppedHost
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
download
.
EnableMock
(
true
)
download
.
EnableMock
(
true
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
...
@@ -238,6 +250,9 @@ func TestStartStoppedHost(t *testing.T) {
...
@@ -238,6 +250,9 @@ func TestStartStoppedHost(t *testing.T) {
}
}
func
TestStartHost
(
t
*
testing
.
T
)
{
func
TestStartHost
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
download
.
EnableMock
(
true
)
download
.
EnableMock
(
true
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
...
@@ -268,6 +283,9 @@ func TestStartHost(t *testing.T) {
...
@@ -268,6 +283,9 @@ func TestStartHost(t *testing.T) {
}
}
func
TestStartHostConfig
(
t
*
testing
.
T
)
{
func
TestStartHostConfig
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
download
.
EnableMock
(
true
)
download
.
EnableMock
(
true
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
...
@@ -310,6 +328,9 @@ func TestStopHostError(t *testing.T) {
...
@@ -310,6 +328,9 @@ func TestStopHostError(t *testing.T) {
}
}
func
TestStopHost
(
t
*
testing
.
T
)
{
func
TestStopHost
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
h
,
err
:=
createHost
(
api
,
&
defaultClusterConfig
,
&
config
.
Node
{
Name
:
"minikube"
})
h
,
err
:=
createHost
(
api
,
&
defaultClusterConfig
,
&
config
.
Node
{
Name
:
"minikube"
})
...
@@ -329,6 +350,9 @@ func TestStopHost(t *testing.T) {
...
@@ -329,6 +350,9 @@ func TestStopHost(t *testing.T) {
}
}
func
TestDeleteHost
(
t
*
testing
.
T
)
{
func
TestDeleteHost
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
if
_
,
err
:=
createHost
(
api
,
&
defaultClusterConfig
,
&
config
.
Node
{
Name
:
"minikube"
});
err
!=
nil
{
if
_
,
err
:=
createHost
(
api
,
&
defaultClusterConfig
,
&
config
.
Node
{
Name
:
"minikube"
});
err
!=
nil
{
...
@@ -344,6 +368,9 @@ func TestDeleteHost(t *testing.T) {
...
@@ -344,6 +368,9 @@ func TestDeleteHost(t *testing.T) {
}
}
func
TestDeleteHostErrorDeletingVM
(
t
*
testing
.
T
)
{
func
TestDeleteHostErrorDeletingVM
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
h
,
err
:=
createHost
(
api
,
&
defaultClusterConfig
,
&
config
.
Node
{
Name
:
"minikube"
})
h
,
err
:=
createHost
(
api
,
&
defaultClusterConfig
,
&
config
.
Node
{
Name
:
"minikube"
})
...
@@ -360,6 +387,9 @@ func TestDeleteHostErrorDeletingVM(t *testing.T) {
...
@@ -360,6 +387,9 @@ func TestDeleteHostErrorDeletingVM(t *testing.T) {
}
}
func
TestDeleteHostErrorDeletingFiles
(
t
*
testing
.
T
)
{
func
TestDeleteHostErrorDeletingFiles
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
api
.
RemoveError
=
true
api
.
RemoveError
=
true
...
@@ -373,6 +403,9 @@ func TestDeleteHostErrorDeletingFiles(t *testing.T) {
...
@@ -373,6 +403,9 @@ func TestDeleteHostErrorDeletingFiles(t *testing.T) {
}
}
func
TestDeleteHostErrMachineNotExist
(
t
*
testing
.
T
)
{
func
TestDeleteHostErrMachineNotExist
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
// Create an incomplete host with machine does not exist error(i.e. User Interrupt Cancel)
// Create an incomplete host with machine does not exist error(i.e. User Interrupt Cancel)
...
@@ -388,6 +421,9 @@ func TestDeleteHostErrMachineNotExist(t *testing.T) {
...
@@ -388,6 +421,9 @@ func TestDeleteHostErrMachineNotExist(t *testing.T) {
}
}
func
TestStatus
(
t
*
testing
.
T
)
{
func
TestStatus
(
t
*
testing
.
T
)
{
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
RegisterMockDriver
(
t
)
RegisterMockDriver
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
api
:=
tests
.
NewMockAPI
(
t
)
...
...
pkg/minikube/node/start.go
浏览文件 @
72e786f7
...
@@ -136,7 +136,9 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
...
@@ -136,7 +136,9 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
}
}
var
wg
sync
.
WaitGroup
var
wg
sync
.
WaitGroup
go
configureMounts
(
&
wg
)
if
!
driver
.
IsKIC
(
starter
.
Cfg
.
Driver
)
{
go
configureMounts
(
&
wg
)
}
wg
.
Add
(
1
)
wg
.
Add
(
1
)
go
func
()
{
go
func
()
{
...
@@ -148,6 +150,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
...
@@ -148,6 +150,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
// enable addons, both old and new!
// enable addons, both old and new!
if
starter
.
ExistingAddons
!=
nil
{
if
starter
.
ExistingAddons
!=
nil
{
wg
.
Add
(
1
)
go
addons
.
Start
(
&
wg
,
starter
.
Cfg
,
starter
.
ExistingAddons
,
config
.
AddonList
)
go
addons
.
Start
(
&
wg
,
starter
.
Cfg
,
starter
.
ExistingAddons
,
config
.
AddonList
)
}
}
...
...
pkg/minikube/notify/notify.go
浏览文件 @
72e786f7
...
@@ -67,8 +67,8 @@ func MaybePrintUpdateText(url string, lastUpdatePath string) bool {
...
@@ -67,8 +67,8 @@ func MaybePrintUpdateText(url string, lastUpdatePath string) bool {
glog
.
Errorf
(
"write time failed: %v"
,
err
)
glog
.
Errorf
(
"write time failed: %v"
,
err
)
}
}
url
:=
"https://github.com/kubernetes/minikube/releases/tag/v"
+
latestVersion
.
String
()
url
:=
"https://github.com/kubernetes/minikube/releases/tag/v"
+
latestVersion
.
String
()
out
.
Err
T
(
style
.
Celebrate
,
`minikube {{.version}} is available! Download it: {{.url}}`
,
out
.
V
{
"version"
:
latestVersion
,
"url"
:
url
})
out
.
T
(
style
.
Celebrate
,
`minikube {{.version}} is available! Download it: {{.url}}`
,
out
.
V
{
"version"
:
latestVersion
,
"url"
:
url
})
out
.
Err
T
(
style
.
Tip
,
"To disable this notice, run: 'minikube config set WantUpdateNotification false'
\n
"
)
out
.
T
(
style
.
Tip
,
"To disable this notice, run: 'minikube config set WantUpdateNotification false'
\n
"
)
return
true
return
true
}
}
return
false
return
false
...
...
pkg/minikube/notify/notify_test.go
浏览文件 @
72e786f7
...
@@ -154,7 +154,7 @@ func TestMaybePrintUpdateText(t *testing.T) {
...
@@ -154,7 +154,7 @@ func TestMaybePrintUpdateText(t *testing.T) {
tempDir
:=
tests
.
MakeTempDir
()
tempDir
:=
tests
.
MakeTempDir
()
defer
tests
.
RemoveTempDir
(
tempDir
)
defer
tests
.
RemoveTempDir
(
tempDir
)
outputBuffer
:=
tests
.
NewFakeFile
()
outputBuffer
:=
tests
.
NewFakeFile
()
out
.
Set
Err
File
(
outputBuffer
)
out
.
Set
Out
File
(
outputBuffer
)
var
tc
=
[]
struct
{
var
tc
=
[]
struct
{
len
int
len
int
...
...
pkg/minikube/perf/start.go
浏览文件 @
72e786f7
...
@@ -58,6 +58,11 @@ func collectResults(ctx context.Context, binaries []*Binary, driver string) (*re
...
@@ -58,6 +58,11 @@ func collectResults(ctx context.Context, binaries []*Binary, driver string) (*re
return
nil
,
errors
.
Wrapf
(
err
,
"timing run %d with %s"
,
run
,
binary
.
Name
())
return
nil
,
errors
.
Wrapf
(
err
,
"timing run %d with %s"
,
run
,
binary
.
Name
())
}
}
rm
.
addResult
(
binary
,
r
)
rm
.
addResult
(
binary
,
r
)
r
,
err
=
timeEnableIngress
(
ctx
,
binary
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"timing run %d with %s"
,
run
,
binary
.
Name
())
}
rm
.
addResult
(
binary
,
r
)
}
}
}
}
return
rm
,
nil
return
rm
,
nil
...
@@ -72,11 +77,24 @@ func average(nums []float64) float64 {
...
@@ -72,11 +77,24 @@ func average(nums []float64) float64 {
}
}
// timeMinikubeStart returns the time it takes to execute `minikube start`
// timeMinikubeStart returns the time it takes to execute `minikube start`
// It deletes the VM after `minikube start`.
func
timeMinikubeStart
(
ctx
context
.
Context
,
binary
*
Binary
,
driver
string
)
(
*
result
,
error
)
{
func
timeMinikubeStart
(
ctx
context
.
Context
,
binary
*
Binary
,
driver
string
)
(
*
result
,
error
)
{
startCmd
:=
exec
.
CommandContext
(
ctx
,
binary
.
path
,
"start"
,
fmt
.
Sprintf
(
"--driver=%s"
,
driver
))
startCmd
:=
exec
.
CommandContext
(
ctx
,
binary
.
path
,
"start"
,
fmt
.
Sprintf
(
"--driver=%s"
,
driver
))
startCmd
.
Stderr
=
os
.
Stderr
startCmd
.
Stderr
=
os
.
Stderr
log
.
Printf
(
"Running: %v..."
,
startCmd
.
Args
)
r
,
err
:=
timeCommandLogs
(
startCmd
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"timing cmd: %v"
,
startCmd
.
Args
)
}
return
r
,
nil
}
// timeEnableIngress returns the time it takes to execute `minikube addons enable ingress`
// It deletes the VM after `minikube addons enable ingress`.
func
timeEnableIngress
(
ctx
context
.
Context
,
binary
*
Binary
)
(
*
result
,
error
)
{
enableCmd
:=
exec
.
CommandContext
(
ctx
,
binary
.
path
,
"addons enable ingress"
)
enableCmd
.
Stderr
=
os
.
Stderr
deleteCmd
:=
exec
.
CommandContext
(
ctx
,
binary
.
path
,
"delete"
)
deleteCmd
:=
exec
.
CommandContext
(
ctx
,
binary
.
path
,
"delete"
)
defer
func
()
{
defer
func
()
{
if
err
:=
deleteCmd
.
Run
();
err
!=
nil
{
if
err
:=
deleteCmd
.
Run
();
err
!=
nil
{
...
@@ -84,10 +102,10 @@ func timeMinikubeStart(ctx context.Context, binary *Binary, driver string) (*res
...
@@ -84,10 +102,10 @@ func timeMinikubeStart(ctx context.Context, binary *Binary, driver string) (*res
}
}
}()
}()
log
.
Printf
(
"Running: %v..."
,
start
Cmd
.
Args
)
log
.
Printf
(
"Running: %v..."
,
enable
Cmd
.
Args
)
r
,
err
:=
timeCommandLogs
(
start
Cmd
)
r
,
err
:=
timeCommandLogs
(
enable
Cmd
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"timing cmd: %v"
,
start
Cmd
.
Args
)
return
nil
,
errors
.
Wrapf
(
err
,
"timing cmd: %v"
,
enable
Cmd
.
Args
)
}
}
return
r
,
nil
return
r
,
nil
}
}
pkg/minikube/reason/known_issues.go
浏览文件 @
72e786f7
...
@@ -92,6 +92,17 @@ var resourceIssues = []match{
...
@@ -92,6 +92,17 @@ var resourceIssues = []match{
},
},
Regexp
:
re
(
`An existing connection was forcibly closed by the remote host`
),
Regexp
:
re
(
`An existing connection was forcibly closed by the remote host`
),
},
},
{
// Fallback to deliver a good error message even if internal checks are not run
Kind
:
Kind
{
ID
:
"RSRC_INSUFFICIENT_CORES"
,
ExitCode
:
ExInsufficientCores
,
Advice
:
"Kubernetes requires at least 2 CPU's to start"
,
Issues
:
[]
int
{
7905
},
URL
:
"https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/"
,
},
Regexp
:
re
(
`ERROR.*the number of available CPUs 1 is less than the required 2`
),
},
}
}
// hostIssues are related to the host operating system or BIOS
// hostIssues are related to the host operating system or BIOS
...
...
pkg/minikube/reason/reason.go
浏览文件 @
72e786f7
...
@@ -155,7 +155,7 @@ var (
...
@@ -155,7 +155,7 @@ var (
}
}
RsrcInsufficientDarwinDockerMemory
=
Kind
{
RsrcInsufficientDarwinDockerMemory
=
Kind
{
ID
:
"RSRC_DOCKER_MEMORY"
,
ID
:
"RSRC_DOCKER_MEMORY"
,
ExitCode
:
ExInsufficient
Cores
,
ExitCode
:
ExInsufficient
Memory
,
Advice
:
`1. Click on "Docker for Desktop" menu icon
Advice
:
`1. Click on "Docker for Desktop" menu icon
2. Click "Preferences"
2. Click "Preferences"
3. Click "Resources"
3. Click "Resources"
...
...
pkg/minikube/registry/drvs/docker/docker.go
浏览文件 @
72e786f7
...
@@ -49,10 +49,20 @@ func init() {
...
@@ -49,10 +49,20 @@ func init() {
}
}
func
configure
(
cc
config
.
ClusterConfig
,
n
config
.
Node
)
(
interface
{},
error
)
{
func
configure
(
cc
config
.
ClusterConfig
,
n
config
.
Node
)
(
interface
{},
error
)
{
mounts
:=
make
([]
oci
.
Mount
,
len
(
cc
.
ContainerVolumeMounts
))
for
i
,
spec
:=
range
cc
.
ContainerVolumeMounts
{
var
err
error
mounts
[
i
],
err
=
oci
.
ParseMountString
(
spec
)
if
err
!=
nil
{
return
nil
,
err
}
}
return
kic
.
NewDriver
(
kic
.
Config
{
return
kic
.
NewDriver
(
kic
.
Config
{
MachineName
:
driver
.
MachineName
(
cc
,
n
),
MachineName
:
driver
.
MachineName
(
cc
,
n
),
StorePath
:
localpath
.
MiniPath
(),
StorePath
:
localpath
.
MiniPath
(),
ImageDigest
:
cc
.
KicBaseImage
,
ImageDigest
:
cc
.
KicBaseImage
,
Mounts
:
mounts
,
CPU
:
cc
.
CPUs
,
CPU
:
cc
.
CPUs
,
Memory
:
cc
.
Memory
,
Memory
:
cc
.
Memory
,
OCIBinary
:
oci
.
Docker
,
OCIBinary
:
oci
.
Docker
,
...
...
pkg/minikube/registry/drvs/podman/podman.go
浏览文件 @
72e786f7
...
@@ -63,10 +63,20 @@ func init() {
...
@@ -63,10 +63,20 @@ func init() {
}
}
func
configure
(
cc
config
.
ClusterConfig
,
n
config
.
Node
)
(
interface
{},
error
)
{
func
configure
(
cc
config
.
ClusterConfig
,
n
config
.
Node
)
(
interface
{},
error
)
{
mounts
:=
make
([]
oci
.
Mount
,
len
(
cc
.
ContainerVolumeMounts
))
for
i
,
spec
:=
range
cc
.
ContainerVolumeMounts
{
var
err
error
mounts
[
i
],
err
=
oci
.
ParseMountString
(
spec
)
if
err
!=
nil
{
return
nil
,
err
}
}
return
kic
.
NewDriver
(
kic
.
Config
{
return
kic
.
NewDriver
(
kic
.
Config
{
MachineName
:
driver
.
MachineName
(
cc
,
n
),
MachineName
:
driver
.
MachineName
(
cc
,
n
),
StorePath
:
localpath
.
MiniPath
(),
StorePath
:
localpath
.
MiniPath
(),
ImageDigest
:
strings
.
Split
(
cc
.
KicBaseImage
,
"@"
)[
0
],
// for podman does not support docker images references with both a tag and digest.
ImageDigest
:
strings
.
Split
(
cc
.
KicBaseImage
,
"@"
)[
0
],
// for podman does not support docker images references with both a tag and digest.
Mounts
:
mounts
,
CPU
:
cc
.
CPUs
,
CPU
:
cc
.
CPUs
,
Memory
:
cc
.
Memory
,
Memory
:
cc
.
Memory
,
OCIBinary
:
oci
.
Podman
,
OCIBinary
:
oci
.
Podman
,
...
...
site/content/en/docs/drivers/includes/none_usage.inc
浏览文件 @
72e786f7
...
@@ -2,16 +2,18 @@
...
@@ -2,16 +2,18 @@
A
Linux
VM
with
the
following
:
A
Linux
VM
with
the
following
:
*
Docker
*
systemd
or
OpenRC
*
systemd
(
OpenRC
based
systems
are
also
supported
in
v1
.10
+
)
*
a
container
runtime
,
such
as
Docker
or
CRIO
This
VM
must
also
meet
the
[
kubeadm
requirements
.
](
https
://
kubernetes
.
io
/
docs
/
setup
/
production
-
environment
/
tools
/
kubeadm
/
install
-
kubeadm
/
)
This
VM
must
also
meet
the
[
kubeadm
requirements
](
https
://
kubernetes
.
io
/
docs
/
setup
/
production
-
environment
/
tools
/
kubeadm
/
install
-
kubeadm
/
),
such
as
:
Kubernetes
v1
.18
+
needs
conntract
to
be
installed
on
debian
based
machines
.
*
2
CPU
'
s
*
2
GB
RAM
```shell
*
iptables
(
in
legacy
mode
)
sudo apt-get install conntrack -y
*
conntrack
```
*
crictl
*
SELinux
permissive
*
cgroups
v1
(
v2
is
not
yet
supported
by
Kubernetes
)
## Usage
## Usage
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录