Skip to content

Commit

Permalink
Possibility to override docker version
Browse files Browse the repository at this point in the history
  • Loading branch information
valtri committed May 22, 2023
1 parent 1e86d0a commit ebcc079
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ The variables that can be passed to this role and a brief description about them
kube_public_dns_name: ""
# Email to be used in the Let's Encrypt issuer
kube_cert_user_email: [email protected]
# Override default docker version
# (installed when not in kube_docker_compatible_versions)
kube_docker_version: ""
# Options to add in the docker.json file
kube_docker_options: {}
# Compatible docker versions
Expand Down
5 changes: 4 additions & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ kube_cert_manager_challenge_dns01_ak: ''
kube_cert_manager_challenge_dns01_sk: ''
# Optionally a wildcard dns certificate name can be set
kube_cert_manager_wildcard_cert_dns_name: ''
# Override default docker version
# (installed when not in kube_docker_compatible_versions)
kube_docker_version: ""
# Options to add in the docker.json file
kube_docker_options: {}
# Compatible docker versions
Expand Down Expand Up @@ -134,4 +137,4 @@ cilium_hubble_priorityClassName: ""
cilium_hubble_ui_ingress_enable: true
cilium_hubble_ui_ingress_host: ""
cilium_hubble_ui_ingress_tls_host: ""
cilium_hubble_ui_ingress_annotations: {}
cilium_hubble_ui_ingress_annotations: {}
4 changes: 2 additions & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
ntp_servers: "{{ kube_ntp_servers }}"
when: kube_ntp_servers != []
- role: 'grycap.docker'
docker_version: '19.03.15'
docker_version: "{{ kube_docker_version | default('19.03.15', true) }}"
docker_compatible_versions: "{{kube_docker_compatible_versions}}"
docker_config_values: "{{ {'exec-opts': ['native.cgroupdriver=systemd'], 'log-driver': 'json-file', 'log-opts': {'max-size': '100m'}, 'storage-driver': 'devicemapper'} | combine(kube_docker_options) }}"
docker_nvidia_support: '{{ kube_nvidia_support and kube_type_of_node == "wn" }}'
Expand All @@ -31,7 +31,7 @@ dependencies:
docker_nvidia_driver_version: "{{ kube_nvidia_driver_version }}"
when: ansible_os_family == "RedHat" and kube_install_method == 'kubeadm'
- role: 'grycap.docker'
docker_version: "5:19.03.11~3-0~{{ansible_distribution | lower}}-{{ansible_distribution_release}}"
docker_version: "{{ kube_docker_version | default('5:19.03.11~3-0~' + (ansible_distribution | lower) + '-' + ansible_distribution_release, true) }}"
docker_compatible_versions: "{{kube_docker_compatible_versions}}"
docker_config_values: "{{ {'exec-opts': ['native.cgroupdriver=systemd'], 'log-driver': 'json-file', 'log-opts': {'max-size': '100m'}, 'storage-driver': 'overlay2'} | combine(kube_docker_options) }}"
docker_nvidia_support: '{{ kube_nvidia_support and kube_type_of_node == "wn" }}'
Expand Down

0 comments on commit ebcc079

Please sign in to comment.