From e5388f3ab16c53a22d5d757f2d91cd38444814dd Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Tue, 23 Mar 2021 10:34:55 +0100 Subject: [PATCH] Use quay.ceph.io to pull the Ceph Dashboard related images The purpose of this change is just to switch to quay.ceph.io and pull from that location the Ceph Dashboard related images. quay.ceph.io is maintained by the Ceph organization and can be trusted to find the tags that we need. This is not a clean cherry-pick since grafana is bumped to 5.4.3, which is the same version (for nautilus) used on ussuri and victoria. Closes-Bug: #1920873 Change-Id: If5ec5d4fa0d4d835561b5963d244e5172fe82cc8 (cherry picked from commit 72c7d4ac71d33c8803120767108c6bf2ffeb2edc) --- .../container_image_prepare_defaults.yaml | 10 +++---- container-images/overcloud_containers.yaml | 8 ++--- container-images/tripleo_containers.yaml | 8 ++--- .../tests/image/test_kolla_builder.py | 30 +++++++++---------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml index 21bbcfcee..5c54f84fd 100644 --- a/container-images/container_image_prepare_defaults.yaml +++ b/container-images/container_image_prepare_defaults.yaml @@ -30,18 +30,18 @@ parameter_defaults: ceph_image: daemon ceph_tag: v4.0.13-stable-4.0-nautilus-centos-7-x86_64 - ceph_prometheus_namespace: quay.io/prometheus + ceph_prometheus_namespace: quay.ceph.io/prometheus ceph_prometheus_image: prometheus ceph_prometheus_tag: v2.7.2 - ceph_alertmanager_namespace: quay.io/prometheus + ceph_alertmanager_namespace: quay.ceph.io/prometheus ceph_alertmanager_image: alertmanager ceph_alertmanager_tag: v0.16.2 - ceph_node_exporter_namespace: quay.io/prometheus + ceph_node_exporter_namespace: quay.ceph.io/prometheus ceph_node_exporter_image: node-exporter ceph_node_exporter_tag: v0.17.0 - ceph_grafana_namespace: quay.io/tripleo + ceph_grafana_namespace: quay.ceph.io/app-sre ceph_grafana_image: grafana - ceph_grafana_tag: 5.2.4 + ceph_grafana_tag: 5.4.3 diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index 5d52440e1..24caa00e7 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -197,13 +197,13 @@ container_images: image_source: kolla - imagename: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64 image_source: ceph -- imagename: quay.io/prometheus/prometheus:v2.7.2 +- imagename: quay.ceph.io/prometheus/prometheus:v2.7.2 image_source: prom -- imagename: quay.io/prometheus/alertmanager:v0.16.2 +- imagename: quay.ceph.io/prometheus/alertmanager:v0.16.2 image_source: prom -- imagename: quay.io/prometheus/node-exporter:v0.17.0 +- imagename: quay.ceph.io/prometheus/node-exporter:v0.17.0 image_source: prom -- imagename: quay.io/tripleo/grafana:5.2.4 +- imagename: quay.ceph.io/app-sre/grafana:5.4.3 image_source: grafana - imagename: quay.io/tripleotrain/centos-binary-tempest:current-tripleo image_source: kolla diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml index f2116ab3b..b6bc338c2 100644 --- a/container-images/tripleo_containers.yaml +++ b/container-images/tripleo_containers.yaml @@ -201,11 +201,11 @@ container_images: imagename: quay.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo - imagename: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64 image_source: ceph -- imagename: quay.io/prometheus/prometheus:v2.7.2 +- imagename: quay.ceph.io/prometheus/prometheus:v2.7.2 image_source: prom -- imagename: quay.io/prometheus/alertmanager:v0.16.2 +- imagename: quay.ceph.io/prometheus/alertmanager:v0.16.2 image_source: prom -- imagename: quay.io/prometheus/node-exporter:v0.17.0 +- imagename: quay.ceph.io/prometheus/node-exporter:v0.17.0 image_source: prom -- imagename: quay.io/tripleo/grafana:5.2.4 +- imagename: quay.ceph.io/app-sre/grafana:5.4.3 image_source: grafana diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py index ef94f244e..df5d60554 100644 --- a/tripleo_common/tests/image/test_kolla_builder.py +++ b/tripleo_common/tests/image/test_kolla_builder.py @@ -254,16 +254,16 @@ class TestKollaImageBuilderTemplate(base.TestCase): 'ceph_namespace': 'quay.ceph.io/ceph-ci', 'ceph_image': 'daemon', 'ceph_tag': 'v4.0.13-stable-4.0-nautilus-centos-7-x86_64', - 'ceph_grafana_namespace': 'quay.io/tripleo', + 'ceph_grafana_namespace': 'quay.ceph.io/app-sre', 'ceph_grafana_image': 'grafana', - 'ceph_grafana_tag': '5.2.4', - 'ceph_prometheus_namespace': 'quay.io/prometheus', + 'ceph_grafana_tag': '5.4.3', + 'ceph_prometheus_namespace': 'quay.ceph.io/prometheus', 'ceph_prometheus_image': 'prometheus', 'ceph_prometheus_tag': 'v2.7.2', - 'ceph_alertmanager_namespace': 'quay.io/prometheus', + 'ceph_alertmanager_namespace': 'quay.ceph.io/prometheus', 'ceph_alertmanager_image': 'alertmanager', 'ceph_alertmanager_tag': 'v0.16.2', - 'ceph_node_exporter_namespace': 'quay.io/prometheus', + 'ceph_node_exporter_namespace': 'quay.ceph.io/prometheus', 'ceph_node_exporter_image': 'node-exporter', 'ceph_node_exporter_tag': 'v0.17.0', 'name_prefix': 'centos-binary-', @@ -281,16 +281,16 @@ class TestKollaImageBuilderTemplate(base.TestCase): 'ceph_namespace': 'quay.ceph.io/ceph-ci', 'ceph_image': 'ceph-daemon', 'ceph_tag': 'latest', - 'ceph_grafana_namespace': 'quay.io/tripleo', + 'ceph_grafana_namespace': 'quay.ceph.io/app-sre', 'ceph_grafana_image': 'grafana', - 'ceph_grafana_tag': '5.2.4', - 'ceph_prometheus_namespace': 'quay.io/prometheus', + 'ceph_grafana_tag': '5.4.3', + 'ceph_prometheus_namespace': 'quay.ceph.io/prometheus', 'ceph_prometheus_image': 'prometheus', 'ceph_prometheus_tag': 'v2.7.2', - 'ceph_alertmanager_namespace': 'quay.io/prometheus', + 'ceph_alertmanager_namespace': 'quay.ceph.io/prometheus', 'ceph_alertmanager_image': 'alertmanager', 'ceph_alertmanager_tag': 'v0.16.2', - 'ceph_node_exporter_namespace': 'quay.io/prometheus', + 'ceph_node_exporter_namespace': 'quay.ceph.io/prometheus', 'ceph_node_exporter_image': 'node-exporter', 'ceph_node_exporter_tag': 'v0.17.0', 'name_prefix': 'prefix-', @@ -338,16 +338,16 @@ class TestKollaImageBuilderTemplate(base.TestCase): 'ceph_namespace': 'quay.ceph.io/ceph-ci', 'ceph_image': 'ceph-daemon', 'ceph_tag': 'latest', - 'ceph_grafana_namespace': 'quay.io/tripleo', + 'ceph_grafana_namespace': 'quay.ceph.io/app-sre', 'ceph_grafana_image': 'grafana', - 'ceph_grafana_tag': '5.2.4', - 'ceph_prometheus_namespace': 'quay.io/prometheus', + 'ceph_grafana_tag': '5.4.3', + 'ceph_prometheus_namespace': 'quay.ceph.io/prometheus', 'ceph_prometheus_image': 'prometheus', 'ceph_prometheus_tag': 'v2.7.2', - 'ceph_alertmanager_namespace': 'quay.io/prometheus', + 'ceph_alertmanager_namespace': 'quay.ceph.io/prometheus', 'ceph_alertmanager_image': 'alertmanager', 'ceph_alertmanager_tag': 'v0.16.2', - 'ceph_node_exporter_namespace': 'quay.io/prometheus', + 'ceph_node_exporter_namespace': 'quay.ceph.io/prometheus', 'ceph_node_exporter_image': 'node-exporter', 'ceph_node_exporter_tag': 'v0.17.0', 'name_prefix': 'prefix-',