Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
82a5189b
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 搜索 >>
未验证
提交
82a5189b
编写于
10月 07, 2020
作者:
P
priyawadhwa
提交者:
GitHub
10月 07, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #9334 from afbjorklund/multiarch-storage-provisioner-manifest
Make storage-provisioner available for all arch
上级
d7c51747
92cce721
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
9 deletion
+20
-9
Makefile
Makefile
+18
-7
deploy/addons/storage-provisioner/storage-provisioner.yaml.tmpl
.../addons/storage-provisioner/storage-provisioner.yaml.tmpl
+1
-1
hack/jenkins/release_build_and_upload.sh
hack/jenkins/release_build_and_upload.sh
+1
-1
未找到文件。
Makefile
浏览文件 @
82a5189b
...
...
@@ -94,12 +94,8 @@ GVISOR_TAG ?= latest
# storage provisioner tag to push changes to
STORAGE_PROVISIONER_TAG
?=
v3
# TODO: multi-arch manifest
ifeq
($(GOARCH),amd64)
STORAGE_PROVISIONER_IMAGE
?=
$(REGISTRY)
/storage-provisioner:
$(STORAGE_PROVISIONER_TAG)
else
STORAGE_PROVISIONER_MANIFEST
?=
$(REGISTRY)
/storage-provisioner:
$(STORAGE_PROVISIONER_TAG)
STORAGE_PROVISIONER_IMAGE
?=
$(REGISTRY)
/storage-provisioner-
$(GOARCH)
:
$(STORAGE_PROVISIONER_TAG)
endif
# Set the version information for the Kubernetes servers
MINIKUBE_LDFLAGS
:=
-X
k8s.io/minikube/pkg/version.version
=
$(VERSION)
-X
k8s.io/minikube/pkg/version.isoVersion
=
$(ISO_VERSION)
-X
k8s.io/minikube/pkg/version.isoPath
=
$(ISO_BUCKET)
-X
k8s.io/minikube/pkg/version.gitCommitID
=
$(COMMIT)
-X
k8s.io/minikube/pkg/version.storageProvisionerVersion
=
$(STORAGE_PROVISIONER_TAG)
...
...
@@ -579,8 +575,11 @@ else
endif
.PHONY
:
storage-provisioner-image
storage-provisioner-image
:
out/storage-provisioner-$(GOARCH)
##
Build storage-provisioner docker image
docker build
-t
$(STORAGE_PROVISIONER_IMAGE)
-f
deploy/storage-provisioner/Dockerfile
--build-arg
arch
=
$(GOARCH)
.
storage-provisioner-image
:
storage-provisioner-image-$(GOARCH)
##
Build storage-provisioner docker image
docker tag
$(REGISTRY)
/storage-provisioner-
$(GOARCH)
:
$(STORAGE_PROVISIONER_TAG)
$(REGISTRY)
/storage-provisioner:
$(STORAGE_PROVISIONER_TAG)
storage-provisioner-image-%
:
out/storage-provisioner-%
docker build
-t
$(REGISTRY)
/storage-provisioner-
$*
:
$(STORAGE_PROVISIONER_TAG)
-f
deploy/storage-provisioner/Dockerfile
--build-arg
arch
=
$*
.
.PHONY
:
kic-base-image
kic-base-image
:
##
builds the base image used for kic.
...
...
@@ -601,6 +600,18 @@ push-storage-provisioner-image: storage-provisioner-image ## Push storage-provis
docker login gcr.io/k8s-minikube
$(MAKE)
push-docker
IMAGE
=
$(STORAGE_PROVISIONER_IMAGE)
ALL_ARCH
=
amd64 arm arm64 ppc64le s390x
IMAGE
=
$(REGISTRY)
/storage-provisioner
TAG
=
$(STORAGE_PROVISIONER_TAG)
.PHONY
:
push-storage-provisioner-manifest
push-storage-provisioner-manifest
:
$(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~storage
\-
provisioner
\-
image
\-
&~g")
docker login gcr.io/k8s-minikube
set
-x
;
for
arch
in
$(ALL_ARCH)
;
do
docker push
${IMAGE}
-
$
${arch}
:
${TAG}
;
done
docker manifest create
--amend
$(IMAGE)
:
$(TAG)
$(
shell
echo
$(ALL_ARCH)
|
sed
-e
"s~[^ ]*~
$(IMAGE)
\-
&:
$(TAG)
~g"
)
set
-x
;
for
arch
in
$(ALL_ARCH)
;
do
docker manifest annotate
--arch
$
${arch}
${IMAGE}
:
${TAG}
${IMAGE}
-
$
${arch}
:
${TAG}
;
done
docker manifest push
$(STORAGE_PROVISIONER_MANIFEST)
.PHONY
:
push-docker
push-docker
:
#
Push docker image base on to IMAGE variable
@
docker pull
$(IMAGE)
&&
echo
"Image already exist in registry"
&&
exit
1
||
echo
"Image doesn't exist in registry"
...
...
deploy/addons/storage-provisioner/storage-provisioner.yaml.tmpl
浏览文件 @
82a5189b
...
...
@@ -101,7 +101,7 @@ spec:
hostNetwork: true
containers:
- name: storage-provisioner
image: {{default "gcr.io/k8s-minikube" .ImageRepository}}/storage-provisioner
{{.ExoticArch}}
:{{.StorageProvisionerVersion}}
image: {{default "gcr.io/k8s-minikube" .ImageRepository}}/storage-provisioner:{{.StorageProvisionerVersion}}
command: ["/storage-provisioner"]
imagePullPolicy: IfNotPresent
volumeMounts:
...
...
hack/jenkins/release_build_and_upload.sh
浏览文件 @
82a5189b
...
...
@@ -67,7 +67,7 @@ if ! [[ ${VERSION_BUILD} =~ ^[0-9]+$ ]]; then
fi
#echo "Updating Docker images ..."
#make push-gvisor-addon-image push-storage-provisioner-
image
#make push-gvisor-addon-image push-storage-provisioner-
manifest
echo
"Updating latest bucket for
${
VERSION
}
release ..."
gsutil
cp
-r
"gs://
${
BUCKET
}
/releases/
${
TAGNAME
}
/*"
"gs://
${
BUCKET
}
/releases/latest/"
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录