Browse Source
Merge pull request #2168 from xd007/docker_arm64
fix docker opts incompatible running on aarch64 Redhat/Centos
pull/3128/head
Antoine Legrand
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
17 additions and
2 deletions
-
inventory/sample/group_vars/k8s-cluster.yml
-
roles/kubernetes/node/templates/kubelet.standard.env.j2
-
roles/kubespray-defaults/defaults/main.yaml
|
|
@ -144,7 +144,13 @@ docker_daemon_graph: "/var/lib/docker" |
|
|
|
## An obvious use case is allowing insecure-registry access |
|
|
|
## 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" |
|
|
|
|
|
|
|
## 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 %} |
|
|
|
--authorization-mode=Webhook \ |
|
|
|
{% endif %} |
|
|
|
{% if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %} |
|
|
|
--cgroup-driver=systemd \ |
|
|
|
{% endif %} |
|
|
|
--enforce-node-allocatable={{ kubelet_enforce_node_allocatable }} {% endif %}{% endset %} |
|
|
|
|
|
|
|
{# 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. |
|
|
|
## An obvious use case is allowing insecure-registry access |
|
|
|
## 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. |
|
|
|
## This option takes a mount propagation flag: shared, slave |
|
|
|