Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
25c7629c
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,发现更多精彩内容 >>
提交
25c7629c
编写于
12月 11, 2017
作者:
I
ijl
提交者:
dlorenc
12月 14, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
crio-bin v1.8.4
上级
e677c963
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
26 addition
and
17 deletion
+26
-17
deploy/addons/coredns/coreDNS-controller.yaml
deploy/addons/coredns/coreDNS-controller.yaml
+1
-1
deploy/addons/efk/elasticsearch-rc.yaml
deploy/addons/efk/elasticsearch-rc.yaml
+1
-1
deploy/addons/registry-creds/registry-creds-rc.yaml
deploy/addons/registry-creds/registry-creds-rc.yaml
+1
-1
deploy/addons/registry/registry-rc.yaml
deploy/addons/registry/registry-rc.yaml
+1
-1
deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
+1
-1
deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
+7
-9
deploy/iso/minikube-iso/package/crio-bin/crio.conf
deploy/iso/minikube-iso/package/crio-bin/crio.conf
+11
-0
deploy/iso/minikube-iso/package/crio-bin/crio.service
deploy/iso/minikube-iso/package/crio-bin/crio.service
+3
-3
未找到文件。
deploy/addons/coredns/coreDNS-controller.yaml
浏览文件 @
25c7629c
...
...
@@ -25,7 +25,7 @@ spec:
effect
:
NoSchedule
containers
:
-
name
:
coredns
image
:
coredns/coredns:0.9.10
image
:
registry.hub.docker.com/
coredns/coredns:0.9.10
imagePullPolicy
:
IfNotPresent
resources
:
limits
:
...
...
deploy/addons/efk/elasticsearch-rc.yaml
浏览文件 @
25c7629c
...
...
@@ -58,7 +58,7 @@ spec:
-
name
:
MINIMUM_MASTER_NODES
value
:
"
1"
initContainers
:
-
image
:
alpine:3.6
-
image
:
registry.hub.docker.com/library/
alpine:3.6
command
:
[
"
/sbin/sysctl"
,
"
-w"
,
"
vm.max_map_count=262144"
]
name
:
elasticsearch-logging-init
securityContext
:
...
...
deploy/addons/registry-creds/registry-creds-rc.yaml
浏览文件 @
25c7629c
...
...
@@ -21,7 +21,7 @@ spec:
addonmanager.kubernetes.io/mode
:
Reconcile
spec
:
containers
:
-
image
:
upmcenterprises/registry-creds:1.8
-
image
:
registry.hub.docker.com/
upmcenterprises/registry-creds:1.8
name
:
registry-creds
imagePullPolicy
:
Always
env
:
...
...
deploy/addons/registry/registry-rc.yaml
浏览文件 @
25c7629c
...
...
@@ -17,7 +17,7 @@ spec:
addonmanager.kubernetes.io/mode
:
Reconcile
spec
:
containers
:
-
image
:
registry:2.6.1
-
image
:
registry
.hub.docker.com/library/registry
:2.6.1
imagePullPolicy
:
IfNotPresent
name
:
registry
ports
:
...
...
deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
浏览文件 @
25c7629c
sha256
00575ca5a093cb1fcd27234f3fc0a729620b7dff7b39057bfddddd48753ff3d7 v1.0.3
.tar.gz
sha256
d310d52706262009af886dbd3e8dcd09a339cdc3b57dc22a9121e6d6a87d2921 v1.8.4
.tar.gz
deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
浏览文件 @
25c7629c
...
...
@@ -4,12 +4,13 @@
#
################################################################################
CRIO_BIN_VERSION
=
v1.
0.3
CRIO_BIN_VERSION
=
v1.
8.4
CRIO_BIN_SITE
=
https://github.com/kubernetes-incubator/cri-o/archive
CRIO_BIN_SOURCE
=
$(CRIO_BIN_VERSION)
.tar.gz
CRIO_BIN_DEPENDENCIES
=
libgpgme
CRIO_BIN_GOPATH
=
$
(
@D
)
/_output
CRIO_BIN_ENV
=
\
CGO_ENABLED
=
1
\
GOPATH
=
"
$(CRIO_BIN_GOPATH)
"
\
PATH
=
$(CRIO_BIN_GOPATH)
/bin:
$(BR_PATH)
...
...
@@ -26,7 +27,10 @@ define CRIO_BIN_CONFIGURE_CMDS
endef
define
CRIO_BIN_BUILD_CMDS
$(CRIO_BIN_ENV)
$(MAKE)
$(TARGET_CONFIGURE_OPTS)
-C
$(@D)
binaries
PREFIX
=
/usr
BUILDTAGS
=
"containers_image_ostree_stub"
mkdir
-p
$(@D)/bin
$(CRIO_BIN_ENV)
$(MAKE)
$(TARGET_CONFIGURE_OPTS)
-C
$(@D)
PREFIX
=
/usr pause
$(CRIO_BIN_ENV)
$(MAKE)
$(TARGET_CONFIGURE_OPTS)
-C
$(@D)
PREFIX
=
/usr crio
$(CRIO_BIN_ENV)
$(MAKE)
$(TARGET_CONFIGURE_OPTS)
-C
$(@D)
PREFIX
=
/usr conmon
endef
define
CRIO_BIN_INSTALL_TARGET_CMDS
...
...
@@ -36,12 +40,6 @@ define CRIO_BIN_INSTALL_TARGET_CMDS
$(INSTALL)
-Dm755
\
$(@D)/bin/crio
\
$(TARGET_DIR)/usr/bin/crio
$(INSTALL)
-Dm755
\
$(@D)/bin/crioctl
\
$(TARGET_DIR)/usr/bin/crioctl
$(INSTALL)
-Dm755
\
$(@D)/bin/kpod
\
$(TARGET_DIR)/usr/bin/kpod
$(INSTALL)
-Dm755
\
$(@D)/bin/conmon
\
$(TARGET_DIR)/usr/libexec/crio/conmon
...
...
@@ -64,7 +62,7 @@ endef
define
CRIO_BIN_INSTALL_INIT_SYSTEMD
$(MAKE)
$(TARGET_CONFIGURE_OPTS)
-C
$(@D)
install.systemd
DESTDIR
=
$(TARGET_DIR)
PREFIX
=
$(TARGET_DIR)
/usr
$(INSTALL)
-Dm
755
\
$(INSTALL)
-Dm
644
\
$(BR2_EXTERNAL_MINIKUBE_PATH)/package/crio-bin/crio.service
\
$(TARGET_DIR)/usr/lib/systemd/system/crio.service
$(call
link-service,crio.service)
...
...
deploy/iso/minikube-iso/package/crio-bin/crio.conf
浏览文件 @
25c7629c
...
...
@@ -99,9 +99,20 @@ cgroup_manager = "cgroupfs"
# hooks_dir_path is the oci hooks directory for automatically executed hooks
hooks_dir_path
=
"/usr/share/containers/oci/hooks.d"
# default_mounts is the mounts list to be mounted for the container when created
default_mounts
= [
]
# pids_limit is the number of processes allowed in a container
pids_limit
=
1024
# enable using a shared PID namespace for containers in a pod
enable_shared_pid_namespace
=
false
# log_size_max is the max limit for the container log size in bytes.
# Negative values indicate that no limit is imposed.
log_size_max
= -
1
# The "crio.image" table contains settings pertaining to the
# management of OCI images.
[
crio
.
image
]
...
...
deploy/iso/minikube-iso/package/crio-bin/crio.service
浏览文件 @
25c7629c
...
...
@@ -12,9 +12,9 @@ EnvironmentFile=/var/run/minikube/env
Environment
=
GOTRACEBACK=crash
ExecStartPre
=
/bin/mkdir -p ${PERSISTENT_DIR}/var/lib/containers
ExecStart
=
/usr/bin/crio
\
$CRIO_OPTIONS
\
$CRIO_MINIKUBE_OPTIONS
\
--root ${PERSISTENT_DIR}/var/lib/containers
$CRIO_OPTIONS
\
$CRIO_MINIKUBE_OPTIONS
\
--root ${PERSISTENT_DIR}/var/lib/containers
ExecReload=/bin/kill -s HUP $MAINPID
TasksMax=8192
LimitNOFILE=1048576
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录