Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
f91f4286
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,发现更多精彩内容 >>
提交
f91f4286
编写于
12月 23, 2016
作者:
X
Xinbo Weng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix duplicated 'the' and some 'a/an' errors
Signed-off-by:
N
Xinbo Weng
<
xihuanbo_0521@zju.edu.cn
>
上级
2ec9198d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
18 addition
and
19 deletion
+18
-19
cmd/localkube/cmd/options.go
cmd/localkube/cmd/options.go
+1
-1
cmd/localkube/cmd/root.go
cmd/localkube/cmd/root.go
+2
-2
hack/jenkins/release_build_and_upload.sh
hack/jenkins/release_build_and_upload.sh
+5
-5
hack/jenkins/release_github_page.sh
hack/jenkins/release_github_page.sh
+6
-7
hack/jenkins/release_update_releases_json.sh
hack/jenkins/release_update_releases_json.sh
+3
-3
pkg/minikube/cluster/credentials.go
pkg/minikube/cluster/credentials.go
+1
-1
未找到文件。
cmd/localkube/cmd/options.go
浏览文件 @
f91f4286
...
...
@@ -50,7 +50,7 @@ func NewLocalkubeServer() *localkube.LocalkubeServer {
// AddFlags adds flags for a specific LocalkubeServer
func
AddFlags
(
s
*
localkube
.
LocalkubeServer
)
{
flag
.
BoolVar
(
&
s
.
Containerized
,
"containerized"
,
s
.
Containerized
,
"If kubelet should run in containerized mode"
)
flag
.
BoolVar
(
&
s
.
EnableDNS
,
"enable-dns"
,
s
.
EnableDNS
,
"DEPRECATED: Please run kube-dns as a
n
cluster addon"
)
flag
.
BoolVar
(
&
s
.
EnableDNS
,
"enable-dns"
,
s
.
EnableDNS
,
"DEPRECATED: Please run kube-dns as a cluster addon"
)
flag
.
StringVar
(
&
s
.
DNSDomain
,
"dns-domain"
,
s
.
DNSDomain
,
"The cluster dns domain"
)
flag
.
IPVar
(
&
s
.
DNSIP
,
"dns-ip"
,
s
.
DNSIP
,
"The cluster dns IP"
)
flag
.
StringVar
(
&
s
.
LocalkubeDirectory
,
"localkube-directory"
,
s
.
LocalkubeDirectory
,
"The directory localkube will store files in"
)
...
...
cmd/localkube/cmd/root.go
浏览文件 @
f91f4286
...
...
@@ -25,8 +25,8 @@ import (
var
RootCmd
=
&
cobra
.
Command
{
Use
:
"localkube"
,
Short
:
"localkube is a all-in-one kubernetes binary."
,
Long
:
`localkube is a all-in-one kubernetes binary that runs all Kubernetes server binaries.`
,
Short
:
"localkube is a
n
all-in-one kubernetes binary."
,
Long
:
`localkube is a
n
all-in-one kubernetes binary that runs all Kubernetes server binaries.`
,
Run
:
func
(
command
*
cobra
.
Command
,
args
[]
string
)
{
StartLocalkube
()
},
...
...
hack/jenkins/release_build_and_upload.sh
浏览文件 @
f91f4286
...
...
@@ -18,11 +18,11 @@
# This is intended to be run on a new release tag in order to build/upload the required files for a release
# The script expects the following env variabls:
# VERSION_MAJOR: The
the
major version of the tag to be released.
# VERSION_MINOR: The
the
minor version of the tag to be released.
# VERSION_BUILD: The
the
build version of the tag to be released.
# VERSION_MAJOR: The major version of the tag to be released.
# VERSION_MINOR: The minor version of the tag to be released.
# VERSION_BUILD: The build version of the tag to be released.
# BUCKET: The GCP bucket the build files should be uploaded to.
# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider.
# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider.
set
-e
...
...
@@ -47,7 +47,7 @@ gsutil cp out/minikube-darwin-amd64.sha256 gs://$BUCKET/releases/$TAGNAME/
gsutil
cp
out/minikube-windows-amd64.exe gs://
$BUCKET
/releases/
$TAGNAME
/
gsutil
cp
out/minikube-windows-amd64.exe.sha256 gs://
$BUCKET
/releases/
$TAGNAME
/
make out/minikube-installer.exe
make out/minikube-installer.exe
gsutil
cp
out/minikube-installer.exe gs://
$BUCKET
/releases/
$TAGNAME
/
make out/minikube_
${
DEB_VERSION
}
.deb
...
...
hack/jenkins/release_github_page.sh
浏览文件 @
f91f4286
...
...
@@ -18,13 +18,13 @@
# This is intended to be run on a new release tag in order to generate the github release page for that release
# The script expects the following env variabls:
# VERSION_MAJOR: The
the
major version of the tag to be released.
# VERSION_MINOR: The
the
minor version of the tag to be released.
# VERSION_BUILD: The
the
build version of the tag to be released.
# VERSION_MAJOR: The major version of the tag to be released.
# VERSION_MINOR: The minor version of the tag to be released.
# VERSION_BUILD: The build version of the tag to be released.
# ISO_SHA256: The sha 256 of the minikube-iso for the current release
# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider.
# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider.
set
-e
set
-e
export
TAGNAME
=
v
${
VERSION_MAJOR
}
.
${
VERSION_MINOR
}
.
${
VERSION_BUILD
}
export
DEB_VERSION
=
${
VERSION_MAJOR
}
.
${
VERSION_MINOR
}
-
${
VERSION_BUILD
}
...
...
@@ -90,7 +90,7 @@ ${WINDOWS_SHA256}
### ISO
\`\`\`
shell
$
openssl sha256 minikube.iso
SHA256(minikube.iso)=
SHA256(minikube.iso)=
${
ISO_SHA256
}
\`\`\`
"
...
...
@@ -116,4 +116,3 @@ github-release upload --user ${GITHUB_ORGANIZATION} --repo ${GITHUB_REPO} --tag
github-release upload
--user
${
GITHUB_ORGANIZATION
}
--repo
${
GITHUB_REPO
}
--tag
${
TAGNAME
}
--name
"minikube-windows-amd64.sha256"
--file
out/minikube-windows-amd64.exe.sha256
github-release upload
--user
${
GITHUB_ORGANIZATION
}
--repo
${
GITHUB_REPO
}
--tag
${
TAGNAME
}
--name
"minikube-installer.exe"
--file
out/minikube-installer.exe
github-release upload
--user
${
GITHUB_ORGANIZATION
}
--repo
${
GITHUB_REPO
}
--tag
${
TAGNAME
}
--name
"minikube_
${
DEB_VERSION
}
.deb"
--file
out/minikube_
${
DEB_VERSION
}
.deb
hack/jenkins/release_update_releases_json.sh
浏览文件 @
f91f4286
...
...
@@ -18,9 +18,9 @@
# This is intended to be run on a new release tag in order to generate the github release page for that release
# The script expects the following env variabls:
# VERSION_MAJOR: The
the
major version of the tag to be released.
# VERSION_MINOR: The
the
minor version of the tag to be released.
# VERSION_BUILD: The
the
build version of the tag to be released.
# VERSION_MAJOR: The major version of the tag to be released.
# VERSION_MINOR: The minor version of the tag to be released.
# VERSION_BUILD: The build version of the tag to be released.
set
-e
...
...
pkg/minikube/cluster/credentials.go
浏览文件 @
f91f4286
...
...
@@ -24,7 +24,7 @@ import (
)
var
(
// This is the internalIP
the
the API server and other components communicate on.
// This is the internalIP
,
the API server and other components communicate on.
internalIP
=
net
.
ParseIP
(
util
.
DefaultServiceClusterIP
)
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录