Merge pull request #2168 from xd007/docker_arm64
fix docker opts incompatible running on aarch64 Redhat/Centos
This commit is contained in:
commit
ac49bbb336
3 changed files with 17 additions and 2 deletions
|
@ -144,7 +144,13 @@ docker_daemon_graph: "/var/lib/docker"
|
||||||
## An obvious use case is allowing insecure-registry access
|
## An obvious use case is allowing insecure-registry access
|
||||||
## to self hosted registries like so:
|
## to self hosted registries like so:
|
||||||
|
|
||||||
docker_options: "--insecure-registry={{ kube_service_addresses }} --graph={{ docker_daemon_graph }} {{ docker_log_opts }}"
|
docker_options: >
|
||||||
|
--insecure-registry={{ kube_service_addresses }} --graph={{ docker_daemon_graph }} {{ docker_log_opts }}
|
||||||
|
{% if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}
|
||||||
|
--add-runtime docker-runc=/usr/libexec/docker/docker-runc-current
|
||||||
|
--default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd
|
||||||
|
--userland-proxy-path=/usr/libexec/docker/docker-proxy-current --signature-verification=false
|
||||||
|
{% endif %}
|
||||||
docker_bin_dir: "/usr/bin"
|
docker_bin_dir: "/usr/bin"
|
||||||
|
|
||||||
## If non-empty will override default system MounFlags value.
|
## If non-empty will override default system MounFlags value.
|
||||||
|
|
|
@ -40,6 +40,9 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
|
||||||
{% if kubelet_authorization_mode_webhook %}
|
{% if kubelet_authorization_mode_webhook %}
|
||||||
--authorization-mode=Webhook \
|
--authorization-mode=Webhook \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}
|
||||||
|
--cgroup-driver=systemd \
|
||||||
|
{% endif %}
|
||||||
--enforce-node-allocatable={{ kubelet_enforce_node_allocatable }} {% endif %}{% endset %}
|
--enforce-node-allocatable={{ kubelet_enforce_node_allocatable }} {% endif %}{% endset %}
|
||||||
|
|
||||||
{# DNS settings for kubelet #}
|
{# DNS settings for kubelet #}
|
||||||
|
|
|
@ -146,7 +146,13 @@ docker_log_opts: "--log-opt max-size=50m --log-opt max-file=5"
|
||||||
## This string should be exactly as you wish it to appear.
|
## This string should be exactly as you wish it to appear.
|
||||||
## An obvious use case is allowing insecure-registry access
|
## An obvious use case is allowing insecure-registry access
|
||||||
## to self hosted registries like so:
|
## to self hosted registries like so:
|
||||||
docker_options: "--insecure-registry={{ kube_service_addresses }} --graph={{ docker_daemon_graph }} {{ docker_log_opts }}"
|
docker_options: >
|
||||||
|
--insecure-registry={{ kube_service_addresses }} --graph={{ docker_daemon_graph }} {{ docker_log_opts }}
|
||||||
|
{% if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}
|
||||||
|
--add-runtime docker-runc=/usr/libexec/docker/docker-runc-current
|
||||||
|
--default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd
|
||||||
|
--userland-proxy-path=/usr/libexec/docker/docker-proxy-current --signature-verification=false
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
## If non-empty will override default system MounFlags value.
|
## If non-empty will override default system MounFlags value.
|
||||||
## This option takes a mount propagation flag: shared, slave
|
## This option takes a mount propagation flag: shared, slave
|
||||||
|
|
Loading…
Reference in a new issue