External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-17 06:17:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

[2.13] Backport recent bugfixes and mainly docker-cli issue (#6179)

Browse Source 
* Reorder tests in packet file (#6067)

* Skip molecule tests for Ubuntu 18.04 (#6077)

* Fix kubernetes-dashboard template identation (#6066)

The 98e7a07fba commit udpates the
dashboard version to 2.0.0 but it enable skip login flag wasn't
updated. This change updates its identation to avoid issues when
dashboard_skip_login is enabled.

* Disable OVH CI (#6114)

* Create namespace when dashboard deployment uses customized namespace. (#6107)

* Create namespace when dashboard deployment uses customized namespace.

* Fix syntax.

* Fix apiserver port when upgrading (#6136)

* Fix docker fedora packages (#6097)

* Match docker-cli version with docker-engine version (when available)

* Disable upgrade jobs to allow release 2.13.1 (docker-cli bug)

Co-authored-by: Maxime Guyot <Miouge1@users.noreply.github.com>
Co-authored-by: Victor Morales <electrocucaracha@gmail.com>
Co-authored-by: petruha <5363545+p37ruh4@users.noreply.github.com>
Co-authored-by: Mateus Caruccio <mateus.caruccio@getupcloud.com>
This commit is contained in:
Florian Ruynat
2020-05-22 16:30:37 +02:00
committed by GitHub
parent 01dbc909be
commit 1f4ef0e86e
16 changed files with 228 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
roles/container-engine/docker/vars/redhat.yml
View File

@@ -16,6 +16,11 @@ docker_versioned_pkg:
'stable': docker-ce-18.09.9-3.el7
'edge': docker-ce-19.03.8-3.el7
docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli-18.09.9-3.el7
'19.03': docker-ce-cli-19.03.9-3.el7
docker_selinux_versioned_pkg:
'latest': docker-ce-selinux-17.03.3.ce-1.el7
'17.03': docker-ce-selinux-17.03.3.ce-1.el7
@@ -30,13 +35,15 @@ docker_pkgs_use_docker_ce:
yum_conf: "{{ docker_yum_conf }}"
docker_pkgs:
- name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
yum_conf: "{{ docker_yum_conf }}"
- name: "{{ docker_versioned_pkg[docker_version | string] }}"
yum_conf: "{{ docker_yum_conf }}"
docker_package_info:
pkg_mgr: yum
pkgs: |-
{%- if docker_version is version('17.04', '<') -%}
{%- if docker_version != "latest" and docker_version is version('17.04', '<') -%}
{{ docker_pkgs_use_docker_ce }}
{%- else -%}
{{ docker_pkgs }}