diff --git a/CHANGELOG-0.7.md b/CHANGELOG-0.7.md index cde8a7486f..4b4ad0658c 100644 --- a/CHANGELOG-0.7.md +++ b/CHANGELOG-0.7.md @@ -66,7 +66,8 @@ - [#1180](https://github.com/epiphany-platform/epiphany/issues/1180) - Update list of ports used by Epiphany components - [#1310](https://github.com/epiphany-platform/epiphany/issues/1310) - Updated Azure-cli from 2.0.67 to 2.6.0 - [#1330](https://github.com/epiphany-platform/epiphany/issues/1330) - Update cloud based OS images -- [#1138](https://github.com/epiphany-platform/epiphany/issues/1138) - Upgrade Kubernetes to 1.17.7 +- [#1138](https://github.com/epiphany-platform/epiphany/issues/1138) - Upgrade Kubernetes to 1.17.70 +- [#1395](https://github.com/epiphany-platform/epiphany/issues/1395) - Upgrade RabbitMQ from 3.7.10 to 3.8.3 ### Fixed diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/rabbitmq/tasks/RedHat.yml b/core/src/epicli/data/common/ansible/playbooks/roles/rabbitmq/tasks/RedHat.yml index 9dda9c0283..b1bfd8981f 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/rabbitmq/tasks/RedHat.yml +++ b/core/src/epicli/data/common/ansible/playbooks/roles/rabbitmq/tasks/RedHat.yml @@ -4,5 +4,5 @@ - socat - logrotate - erlang-21.3.* # order matters, check RabbitMQ/Erlang version compatibility matrix before modification - - rabbitmq-server-3.7.10 - state: present \ No newline at end of file + - rabbitmq-server-3.8.3 + state: present diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt index ceb76a1c4c..fd4dfbc139 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt @@ -88,7 +88,7 @@ python-slip-dbus # for firewalld python-ipaddress python-backports quota # for nfs-utils -rabbitmq-server-3.7.10 +rabbitmq-server-3.8.3 rh-haproxy18 rh-haproxy18-haproxy-syspaths postgresql10-server @@ -172,7 +172,7 @@ brainsam/pgbouncer:1.12 # TODO remove? jboss/keycloak:4.8.3.Final jboss/keycloak:9.0.0 -rabbitmq:3.7.10 +rabbitmq:3.8.3 # K8s upgrade ## v1.14.6 k8s.gcr.io/kube-apiserver:v1.14.6 diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt index 7dfd9cd12c..ebb731c231 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt @@ -85,7 +85,7 @@ python-psycopg2 python-setuptools python-slip-dbus # for firewalld quota # for nfs-utils -rabbitmq-server-3.7.10 +rabbitmq-server-3.8.3 rh-haproxy18 rh-haproxy18-haproxy-syspaths postgresql10-server @@ -169,7 +169,7 @@ brainsam/pgbouncer:1.12 # TODO remove? jboss/keycloak:4.8.3.Final jboss/keycloak:9.0.0 -rabbitmq:3.7.10 +rabbitmq:3.8.3 # K8s upgrade ## v1.14.6 k8s.gcr.io/kube-apiserver:v1.14.6 diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt index b90528cf33..1bd5ae303b 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt @@ -46,7 +46,7 @@ python-pip python-psycopg2 python-selinux python-setuptools -rabbitmq-server 3.7.10 +rabbitmq-server 3.8.3 smbclient samba-common smbclient @@ -194,7 +194,7 @@ brainsam/pgbouncer:1.12 # TODO remove? jboss/keycloak:4.8.3.Final jboss/keycloak:9.0.0 -rabbitmq:3.7.10 +rabbitmq:3.8.3 # K8s upgrade ## v1.14.6 k8s.gcr.io/kube-apiserver:v1.14.6 diff --git a/core/src/epicli/data/common/defaults/configuration/applications.yml b/core/src/epicli/data/common/defaults/configuration/applications.yml index 8b98bcb40f..119ff86dee 100644 --- a/core/src/epicli/data/common/defaults/configuration/applications.yml +++ b/core/src/epicli/data/common/defaults/configuration/applications.yml @@ -26,7 +26,7 @@ specification: - name: rabbitmq enabled: no - image_path: rabbitmq:3.7.10 + image_path: rabbitmq:3.8.3 use_local_image_registry: true #image_pull_secret_name: regcred # optional service: diff --git a/core/src/epicli/data/common/defaults/configuration/image-registry.yml b/core/src/epicli/data/common/defaults/configuration/image-registry.yml index 1a71c63fee..4ecf855d74 100644 --- a/core/src/epicli/data/common/defaults/configuration/image-registry.yml +++ b/core/src/epicli/data/common/defaults/configuration/image-registry.yml @@ -10,8 +10,8 @@ specification: generic: - name: "jboss/keycloak:9.0.0" file_name: keycloak-9.0.0.tar - - name: "rabbitmq:3.7.10" - file_name: rabbitmq-3.7.10.tar + - name: "rabbitmq:3.8.3" + file_name: rabbitmq-3.8.3.tar - name: "apacheignite/ignite:2.5.0" file_name: ignite-2.5.0.tar - name: "kubernetesui/dashboard:v2.0.3" diff --git a/core/src/epicli/data/common/defaults/configuration/rabbitmq.yml b/core/src/epicli/data/common/defaults/configuration/rabbitmq.yml index 3357eaf50e..4b5f0cc449 100644 --- a/core/src/epicli/data/common/defaults/configuration/rabbitmq.yml +++ b/core/src/epicli/data/common/defaults/configuration/rabbitmq.yml @@ -2,7 +2,7 @@ kind: configuration/rabbitmq title: "RabbitMQ" name: default specification: - version: 3.7.10 + version: 3.8.3 rabbitmq_user: rabbitmq rabbitmq_group: rabbitmq @@ -16,4 +16,4 @@ specification: rabbitmq_plugins: [] custom_configurations: [] cluster: - is_clustered: false \ No newline at end of file + is_clustered: false diff --git a/docs/home/COMPONENTS.md b/docs/home/COMPONENTS.md index d38378b2e7..822ab79c27 100644 --- a/docs/home/COMPONENTS.md +++ b/docs/home/COMPONENTS.md @@ -12,7 +12,7 @@ Note that versions are default versions and can be changed in certain cases thro | Canal | 3.15.0 | https://github.com/projectcalico/calico | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) | | Kafka | 2.3.1 | https://github.com/apache/kafka | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) | | Zookeeper | 3.4.12 | https://github.com/apache/zookeeper | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) | -| RabbitMQ | 3.7.10 | https://github.com/rabbitmq/rabbitmq-server | [Mozilla Public License](https://www.mozilla.org/en-US/MPL/) | +| 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) | | KeyCloak | 9.0.0 | https://github.com/keycloak/keycloak | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) | | Elasticsearch OSS | 7.6.1 | https://github.com/elastic/elasticsearch | https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt |