Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
1790589f
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,发现更多精彩内容 >>
提交
1790589f
编写于
5月 06, 2019
作者:
M
Medya Gh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replace ARCH sed macros with Go templates
上级
2ddd4c59
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
8 addition
and
24 deletion
+8
-24
Makefile
Makefile
+1
-20
deploy/addons/addon-manager.template
deploy/addons/addon-manager.template
+1
-1
deploy/addons/ingress/ingress-dp.template
deploy/addons/ingress/ingress-dp.template
+2
-2
deploy/addons/storage-provisioner/storage-provisioner.template
...y/addons/storage-provisioner/storage-provisioner.template
+1
-1
pkg/minikube/assets/addons.go
pkg/minikube/assets/addons.go
+3
-0
未找到文件。
Makefile
浏览文件 @
1790589f
...
...
@@ -100,25 +100,6 @@ ifeq ($(GOOS),windows)
IS_EXE
=
".exe"
endif
ifeq
($(GOARCH),amd64)
ARCHTAG
?=
-amd64
ARCHTAG_NONE
?=
else
ARCHTAG
?=
-
$(GOARCH)
ARCHTAG_NONE
?=
-
$(GOARCH)
endif
DEPLOYS
=
\
deploy/addons/addon-manager.yaml
\
deploy/addons/dashboard/dashboard-dp.yaml
\
deploy/addons/heapster/heapster-rc.yaml
\
deploy/addons/heapster/influx-grafana-rc.yaml
\
deploy/addons/ingress/ingress-dp.yaml
\
deploy/addons/metrics-server/metrics-server-deployment.yaml
\
deploy/addons/storage-provisioner/storage-provisioner.yaml
%.yaml
:
%.template
sed
"s|
\-
ARCHTAG_NONE|
$(ARCHTAG_NONE)
|g;s|
\-
ARCHTAG|
$(ARCHTAG)
|g"
$<
>
$@
out/minikube$(IS_EXE)
:
out/minikube-$(GOOS)-$(GOARCH)$(IS_EXE)
cp
$<
$@
...
...
@@ -131,7 +112,7 @@ out/minikube.d: pkg/minikube/assets/assets.go
-include
out/minikube.d
out/minikube-%
:
$(DEPLOYS)
pkg/minikube/assets/assets.go
out/minikube-%
:
pkg/minikube/assets/assets.go
ifeq
($(MINIKUBE_BUILD_IN_DOCKER),y)
$(
call
DOCKER,
$(BUILD_IMAGE)
,/usr/bin/make
$@
)
else
...
...
deploy/addons/addon-manager.template
浏览文件 @
1790589f
...
...
@@ -25,7 +25,7 @@ spec:
hostNetwork: true
containers:
- name: kube-addon-manager
image: {{default "k8s.gcr.io" .ImageRepository}}/kube-addon-manager-
ARCHTAG_NONE
:v9.0
image: {{default "k8s.gcr.io" .ImageRepository}}/kube-addon-manager-
{{.Arch}}
:v9.0
env:
- name: KUBECONFIG
value: /var/lib/minikube/kubeconfig
...
...
deploy/addons/ingress/ingress-dp.template
浏览文件 @
1790589f
...
...
@@ -39,7 +39,7 @@ spec:
# Any image is permissible as long as:
# 1. It serves a 404 page at /
# 2. It serves 200 on a /healthz endpoint
image: {{default "gcr.io/google_containers" .ImageRepository}}/defaultbackend-
ARCHTAG_NONE
:1.4
image: {{default "gcr.io/google_containers" .ImageRepository}}/defaultbackend-
{{.Arch}}
:1.4
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
...
...
@@ -87,7 +87,7 @@ spec:
serviceAccountName: nginx-ingress
terminationGracePeriodSeconds: 60
containers:
- image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller-
ARCHTAG_NONE
:0.23.0
- image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller-
{{.Arch}}
:0.23.0
name: nginx-ingress-controller
imagePullPolicy: IfNotPresent
readinessProbe:
...
...
deploy/addons/storage-provisioner/storage-provisioner.template
浏览文件 @
1790589f
...
...
@@ -51,7 +51,7 @@ spec:
hostNetwork: true
containers:
- name: storage-provisioner
image: {{default "gcr.io/k8s-minikube" .ImageRepository}}/storage-provisioner-
ARCHTAG_NONE
:v1.8.1
image: {{default "gcr.io/k8s-minikube" .ImageRepository}}/storage-provisioner-
{{.Arch}}
:v1.8.1
command: ["/storage-provisioner"]
imagePullPolicy: IfNotPresent
volumeMounts:
...
...
pkg/minikube/assets/addons.go
浏览文件 @
1790589f
...
...
@@ -21,6 +21,7 @@ import (
"os"
"path"
"path/filepath"
"runtime"
"strconv"
"github.com/pkg/errors"
...
...
@@ -382,8 +383,10 @@ func addMinikubeDirToAssets(basedir, vmpath string, assets *[]CopyableFile) erro
func
GenerateTemplateData
(
cfg
config
.
KubernetesConfig
)
interface
{}
{
opts
:=
struct
{
ImageRepository
string
Arch
string
}{
ImageRepository
:
cfg
.
ImageRepository
,
Arch
:
runtime
.
GOARCH
,
}
return
opts
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录