Skip to content

Commit

Permalink
[Backport] Upgrade Docker to v19.03.14 (#2018)
Browse files Browse the repository at this point in the history
* Backported upgrade to Docker v19.03.14

* Backported #1888 fix

* Update changelog

* Changed rabbitmq component version

* Changed filebeat component version

* licenses.py from v0.8

* Updated only docker version in components

* Renamed modules document

Co-authored-by: to-bar <46519524+to-bar@users.noreply.github.com>
Co-authored-by: atsikham <atsikham@users.noreply.github.com>
  • Loading branch information
3 people committed Feb 4, 2021
1 parent 007293f commit 89bfa61
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 13 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG-0.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@

- [#1875](https://github.com/epiphany-platform/epiphany/issues/1875) - epicli upgrade fails when there is no kubernetes_master group in inventory
- [#1884](https://github.com/epiphany-platform/epiphany/issues/1884) - Prometheus is not able to scrape metrics from AKS/EKS nodes
- [#1888](https://github.com/epiphany-platform/epiphany/issues/1888) - epicli upgrade of cluster created by Epiphany v0.5 may fail

### Updated

- [#1964](https://github.com/epiphany-platform/epiphany/issues/1964) - Upgrade Elasticsearch Curator to v5.8.3
- [#1919](https://github.com/epiphany-platform/epiphany/issues/1919) - Upgrade Kafka to v2.6.0
- [#1926](https://github.com/epiphany-platform/epiphany/issues/1926) - Upgrade Zookeeper to v3.5.8
- [#1855](https://github.com/epiphany-platform/epiphany/issues/1855) - Upgrade Docker to v19.03.14

## [0.8.0] 2020-10-22

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Logging
---
docker_logging:
log_opts:
max_file_size: 10m # The maximum size of the log before it is rolled. A positive integer plus a modifier representing the unit of measure (k, m, or g)
max_files: 2 # The maximum number of log files that can be present

docker_version:
Debian: "5:18.09.*"
RedHat: "18.09.*"
docker_version:
Debian: "5:19.03.14*" # * is needed to match a version such as '5:19.03.14~3-0~ubuntu-bionic'
RedHat: "19.03.14"
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@
- name: Verify logging driver # 'json-file' is needed for K8s metadata in Filebeat and log rotation
assert:
that: "'json-file' in docker_log_driver.stdout"
msg: "Unexpected logging driver, docker_log_driver.stdout: '{{ docker_log_driver.stdout }}'"
fail_msg: "Unexpected logging driver, docker_log_driver.stdout: '{{ docker_log_driver.stdout }}'"
quiet: true
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
vars:
packages:
RedHat:
- containerd.io
- docker-ce-cli-{{ docker_version.RedHat }}
- docker-ce-{{ docker_version.RedHat }}
Debian:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ container-selinux
cri-tools-1.13.0
curl
dejavu-sans-fonts # for grafana
docker-ce-18.09.9
docker-ce-cli-18.09.9
docker-ce-19.03.14
docker-ce-cli-19.03.14
ebtables
elasticsearch-curator-5.8.3
elasticsearch-oss-6.8.5 # for elasticsearch role
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ container-selinux
cri-tools-1.13.0
curl
dejavu-sans-fonts # for grafana
docker-ce-18.09.9
docker-ce-cli-18.09.9
docker-ce-19.03.14
docker-ce-cli-19.03.14
ebtables
elasticsearch-curator-5.8.3
elasticsearch-oss-6.8.5 # for elasticsearch role
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ cifs-utils
containerd.io
cri-tools 1.13.0
curl
docker-ce 5:18.09
docker-ce-cli 5:18.09
docker-ce 5:19.03.14
docker-ce-cli 5:19.03.14
ebtables
elasticsearch-curator 5.8.3
elasticsearch-oss 6.8.5 # for elasticsearch role
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@
- name: k8s/master0 | Wait for cluster's readiness
include_tasks: utils/wait.yml

# Even though cluster is seen as ready here, the next task may occasionally fail with error like
# "Error from server (NotFound): the server could not find the requested resource".
# The following task prevents this issue.
- name: k8s/master0 | Refresh api-resources cache
shell: kubectl api-resources --cached=false > /dev/null
when:
- version is version('1.18', '<')

# 'kubeadm upgrade apply' overwrites Epiphany's customized CoreDNS so we patch it again.
# This task restores 'hosts' plugin and should be run each time K8s was upgraded in order to support "--wait-for-pods" epicli feature (issue #1218).
- name: k8s/master0 | Customize CoreDNS
Expand Down
2 changes: 1 addition & 1 deletion docs/home/COMPONENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Note that versions are default versions and can be changed in certain cases thro
| Kafka | 2.6.0 | https://github.com/apache/kafka | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Zookeeper | 3.5.8 | https://github.com/apache/zookeeper | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| RabbitMQ | 3.8.3 | https://github.com/rabbitmq/rabbitmq-server | [Mozilla Public License](https://www.mozilla.org/en-US/MPL/) |
| Docker-ce | 18.09 | https://github.com/docker/docker-ce/ | [Apache License](https://www.apache.org/licenses/LICENSE-1.0) |
| Docker CE | 19.03.14 | https://github.com/docker/docker-ce/ | [Apache License](https://www.apache.org/licenses/LICENSE-1.0) |
| KeyCloak | 9.0.0 | https://github.com/keycloak/keycloak | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Elasticsearch OSS | 7.9.1 | https://github.com/elastic/elasticsearch | https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt |
| Elasticsearch Curator OSS | 5.8.3 | https://github.com/elastic/curator | https://github.com/elastic/curator/blob/master/LICENSE.txt |
Expand Down
2 changes: 1 addition & 1 deletion docs/home/HOWTO.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,4 @@
- [AWS Security groups](./howto/SECURITY_GROUPS.md#aws-security-groups)
- [AWS Security groups full yaml file](./howto/SECURITY_GROUPS.md#aws-setting-groups-full-yaml-file)

- [Modules](./howto/modules.md)
- [Modules](./howto/MODULES.md)
File renamed without changes.

0 comments on commit 89bfa61

Please sign in to comment.