Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
6d59d9d7
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
6d59d9d7
编写于
2月 05, 2020
作者:
S
Sharif Elgamal
提交者:
GitHub
2月 05, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6200 from laozc/node-name
Use profile name as cluster/node name
上级
de1a4911
fc85dd6d
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
21 addition
and
8 deletion
+21
-8
cmd/minikube/cmd/start.go
cmd/minikube/cmd/start.go
+7
-1
pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
+1
-1
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
+1
-1
pkg/minikube/bootstrapper/bsutil/kubeadm.go
pkg/minikube/bootstrapper/bsutil/kubeadm.go
+2
-0
pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
+2
-0
pkg/minikube/bootstrapper/bsutil/kubelet.go
pkg/minikube/bootstrapper/bsutil/kubelet.go
+4
-1
pkg/minikube/bootstrapper/bsutil/kubelet_test.go
pkg/minikube/bootstrapper/bsutil/kubelet_test.go
+1
-1
pkg/minikube/bootstrapper/bsutil/versions.go
pkg/minikube/bootstrapper/bsutil/versions.go
+0
-2
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+2
-1
pkg/minikube/config/types.go
pkg/minikube/config/types.go
+1
-0
未找到文件。
cmd/minikube/cmd/start.go
浏览文件 @
6d59d9d7
...
...
@@ -927,11 +927,16 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
out
.
T
(
out
.
SuccessType
,
"Using image repository {{.name}}"
,
out
.
V
{
"name"
:
repository
})
}
var
kubeNodeName
string
if
drvName
!=
driver
.
None
{
kubeNodeName
=
viper
.
GetString
(
config
.
MachineProfile
)
}
// Create the initial node, which will necessarily be a control plane
cp
:=
config
.
Node
{
Port
:
viper
.
GetInt
(
apiServerPort
),
KubernetesVersion
:
k8sVersion
,
Name
:
constants
.
Default
NodeName
,
Name
:
kube
NodeName
,
ControlPlane
:
true
,
Worker
:
true
,
}
...
...
@@ -969,6 +974,7 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
NatNicType
:
viper
.
GetString
(
natNicType
),
KubernetesConfig
:
config
.
KubernetesConfig
{
KubernetesVersion
:
k8sVersion
,
ClusterName
:
viper
.
GetString
(
config
.
MachineProfile
),
APIServerName
:
viper
.
GetString
(
apiServerName
),
APIServerNames
:
apiServerNames
,
APIServerIPs
:
apiServerIPs
,
...
...
pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
浏览文件 @
6d59d9d7
...
...
@@ -48,7 +48,7 @@ kind: ClusterConfiguration
{{$i}}: {{$val}}{{end}}
{{end -}}
certificatesDir: {{.CertDir}}
clusterName:
kubernetes
clusterName:
{{.ClusterName}}
apiServerCertSANs: ["127.0.0.1", "localhost", "{{.AdvertiseAddress}}"]
controlPlaneEndpoint: localhost:{{.APIServerPort}}
etcd:
...
...
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
浏览文件 @
6d59d9d7
...
...
@@ -51,7 +51,7 @@ kind: ClusterConfiguration
{{range $i, $val := .FeatureArgs}}{{$i}}: {{$val}}
{{end -}}{{end -}}
certificatesDir: {{.CertDir}}
clusterName:
kubernetes
clusterName:
{{.ClusterName}}
apiServer:
certSANs: ["127.0.0.1", "localhost", "{{.AdvertiseAddress}}"]
controlPlaneEndpoint: localhost:{{.APIServerPort}}
...
...
pkg/minikube/bootstrapper/bsutil/kubeadm.go
浏览文件 @
6d59d9d7
...
...
@@ -71,6 +71,7 @@ func GenerateKubeadmYAML(mc config.MachineConfig, r cruntime.Manager) ([]byte, e
APIServerPort
int
KubernetesVersion
string
EtcdDataDir
string
ClusterName
string
NodeName
string
DNSDomain
string
CRISocket
string
...
...
@@ -86,6 +87,7 @@ func GenerateKubeadmYAML(mc config.MachineConfig, r cruntime.Manager) ([]byte, e
APIServerPort
:
nodePort
,
KubernetesVersion
:
k8s
.
KubernetesVersion
,
EtcdDataDir
:
EtcdDataDir
(),
ClusterName
:
k8s
.
ClusterName
,
NodeName
:
cp
.
Name
,
CRISocket
:
r
.
SocketPath
(),
ImageRepository
:
k8s
.
ImageRepository
,
...
...
pkg/minikube/bootstrapper/bsutil/kubeadm_test.go
浏览文件 @
6d59d9d7
...
...
@@ -127,6 +127,7 @@ func TestGenerateKubeadmYAMLDNS(t *testing.T) {
},
}
cfg
.
KubernetesConfig
.
KubernetesVersion
=
version
+
".0"
cfg
.
KubernetesConfig
.
ClusterName
=
"kubernetes"
got
,
err
:=
GenerateKubeadmYAML
(
cfg
,
runtime
)
if
err
!=
nil
&&
!
tc
.
shouldErr
{
...
...
@@ -207,6 +208,7 @@ func TestGenerateKubeadmYAML(t *testing.T) {
}
}
cfg
.
KubernetesConfig
.
KubernetesVersion
=
version
+
".0"
cfg
.
KubernetesConfig
.
ClusterName
=
"kubernetes"
got
,
err
:=
GenerateKubeadmYAML
(
cfg
,
runtime
)
if
err
!=
nil
&&
!
tc
.
shouldErr
{
...
...
pkg/minikube/bootstrapper/bsutil/kubelet.go
浏览文件 @
6d59d9d7
...
...
@@ -30,7 +30,7 @@ import (
// NewKubeletConfig generates a new systemd unit containing a configured kubelet
// based on the options present in the KubernetesConfig.
func
NewKubeletConfig
(
mc
config
.
MachineConfig
,
r
cruntime
.
Manager
)
([]
byte
,
error
)
{
func
NewKubeletConfig
(
mc
config
.
MachineConfig
,
nc
config
.
Node
,
r
cruntime
.
Manager
)
([]
byte
,
error
)
{
k8s
:=
mc
.
KubernetesConfig
version
,
err
:=
ParseKubernetesVersion
(
k8s
.
KubernetesVersion
)
if
err
!=
nil
{
...
...
@@ -60,6 +60,9 @@ func NewKubeletConfig(mc config.MachineConfig, r cruntime.Manager) ([]byte, erro
if
_
,
ok
:=
extraOpts
[
"node-ip"
];
!
ok
{
extraOpts
[
"node-ip"
]
=
cp
.
IP
}
if
nc
.
Name
!=
""
{
extraOpts
[
"hostname-override"
]
=
nc
.
Name
}
pauseImage
:=
images
.
Pause
(
k8s
.
ImageRepository
)
if
_
,
ok
:=
extraOpts
[
"pod-infra-container-image"
];
!
ok
&&
k8s
.
ImageRepository
!=
""
&&
pauseImage
!=
""
&&
k8s
.
ContainerRuntime
!=
remoteContainerRuntime
{
...
...
pkg/minikube/bootstrapper/bsutil/kubelet_test.go
浏览文件 @
6d59d9d7
...
...
@@ -177,7 +177,7 @@ ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhoo
t
.
Fatalf
(
"runtime: %v"
,
err
)
}
got
,
err
:=
NewKubeletConfig
(
tc
.
cfg
,
runtime
)
got
,
err
:=
NewKubeletConfig
(
tc
.
cfg
,
tc
.
cfg
.
Nodes
[
0
],
runtime
)
if
err
!=
nil
&&
!
tc
.
shouldErr
{
t
.
Errorf
(
"got unexpected error generating config: %v"
,
err
)
return
...
...
pkg/minikube/bootstrapper/bsutil/versions.go
浏览文件 @
6d59d9d7
...
...
@@ -23,7 +23,6 @@ import (
"github.com/blang/semver"
"github.com/pkg/errors"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/minikube/vmpath"
"k8s.io/minikube/pkg/util"
)
...
...
@@ -71,7 +70,6 @@ var versionSpecificOpts = []config.VersionedExtraOption{
},
LessThanOrEqual
:
semver
.
MustParse
(
"1.9.10"
),
},
config
.
NewUnversionedOption
(
Kubelet
,
"hostname-override"
,
constants
.
DefaultNodeName
),
// System pods args
config
.
NewUnversionedOption
(
Kubelet
,
"pod-manifest-path"
,
vmpath
.
GuestManifestsDir
),
...
...
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
浏览文件 @
6d59d9d7
...
...
@@ -434,7 +434,8 @@ func (k *Bootstrapper) UpdateCluster(cfg config.MachineConfig) error {
return
errors
.
Wrap
(
err
,
"generating kubeadm cfg"
)
}
kubeletCfg
,
err
:=
bsutil
.
NewKubeletConfig
(
cfg
,
r
)
// TODO: multiple nodes
kubeletCfg
,
err
:=
bsutil
.
NewKubeletConfig
(
cfg
,
cfg
.
Nodes
[
0
],
r
)
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"generating kubelet config"
)
}
...
...
pkg/minikube/config/types.go
浏览文件 @
6d59d9d7
...
...
@@ -70,6 +70,7 @@ type MachineConfig struct {
// KubernetesConfig contains the parameters used to configure the VM Kubernetes.
type
KubernetesConfig
struct
{
KubernetesVersion
string
ClusterName
string
APIServerName
string
APIServerNames
[]
string
APIServerIPs
[]
net
.
IP
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录