openstack
/
tripleo-common
Code Issues Proposed changes

Fix tags for openshift images 

The latest published image for cluster-monitoring-operator (v0.1.1) has
hardcoded tags for prometheus-config-reloader and prometheus-operator
images [1] that doesn't match the ones we set in tripleo.

In turn, prometheus-operator v0.23.2 requires specific version of
different images. This commit updates all image tags to a combination
that works out of the box.

[1] https://github.com/openshift/cluster-monitoring-operator/blob/v0.1.1/assets/prometheus-operator/deployment.yaml

Closes-Bug: #1809895
Change-Id: Ieea6d328d985199605f7d8b5cc654c011110621c
(cherry picked from commit cf3cd200d5)
This commit is contained in:
Martin André 2018-12-26 22:36:59 +01:00
parent 0af9f9942e
commit 6fc7e1bf73
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
container-images/container_image_prepare_defaults.yaml
View File

@ -52,22 +52,22 @@ parameter_defaults:
openshift_cluster_monitoring_tag: v0.1.1
openshift_configmap_reload_namespace: docker.io/tripleorocky
openshift_configmap_reload_image: coreos-configmap-reload
openshift_configmap_reload_tag: latest
openshift_configmap_reload_tag: v0.0.1
openshift_prometheus_operator_namespace: docker.io/tripleorocky
openshift_prometheus_operator_image: coreos-prometheus-operator
openshift_prometheus_operator_tag: latest
openshift_prometheus_operator_tag: v0.23.2
openshift_prometheus_config_reload_namespace: docker.io/tripleorocky
openshift_prometheus_config_reload_image: coreos-prometheus-config-reloader
openshift_prometheus_config_reload_tag: v0.24.0
openshift_prometheus_tag: latest
openshift_prometheus_alertmanager_tag: latest
openshift_prometheus_node_exporter_tag: latest
openshift_oauth_proxy_tag: latest
openshift_prometheus_config_reload_tag: v0.23.2
openshift_prometheus_tag: v2.3.2
openshift_prometheus_alertmanager_tag: v0.15.2
openshift_prometheus_node_exporter_tag: v0.16.0
openshift_oauth_proxy_tag: v1.1.0
openshift_kube_rbac_proxy_namespace: docker.io/tripleorocky
openshift_kube_rbac_proxy_image: coreos-kube-rbac-proxy
openshift_kube_rbac_proxy_tag: v0.3.1
openshift_kube_state_metrics_namespace: docker.io/tripleorocky
openshift_kube_state_metrics_image: coreos-kube-state-metrics
openshift_kube_state_metrics_tag: latest
openshift_kube_state_metrics_tag: v1.3.1
openshift_grafana_namespace: docker.io/grafana
openshift_grafana_tag: latest
openshift_grafana_tag: 5.2.1

18
container-images/overcloud_containers.yaml
View File

@ -122,13 +122,13 @@ container_images:
- imagename: docker.io/gluster/glusterblock-provisioner:latest
- imagename: docker.io/heketi/heketi:latest
- imagename: docker.io/tripleorocky/coreos-cluster-monitoring-operator:v0.1.1
- imagename: docker.io/tripleorocky/coreos-configmap-reload:latest
- imagename: docker.io/tripleorocky/coreos-prometheus-operator:latest
- imagename: docker.io/tripleorocky/coreos-prometheus-config-reloader:v0.24.0
- imagename: docker.io/openshift/prometheus:latest
- imagename: docker.io/openshift/prometheus-alertmanager:latest
- imagename: docker.io/openshift/prometheus-node-exporter:latest
- imagename: docker.io/openshift/oauth-proxy:latest
- imagename: docker.io/tripleorocky/coreos-configmap-reload:v0.0.1
- imagename: docker.io/tripleorocky/coreos-prometheus-operator:v0.23.2
- imagename: docker.io/tripleorocky/coreos-prometheus-config-reloader:v0.23.2
- imagename: docker.io/openshift/prometheus:v2.3.2
- imagename: docker.io/openshift/prometheus-alertmanager:v0.15.2
- imagename: docker.io/openshift/prometheus-node-exporter:v0.16.0
- imagename: docker.io/openshift/oauth-proxy:v1.1.0
- imagename: docker.io/tripleorocky/coreos-kube-rbac-proxy:v0.3.1
- imagename: docker.io/tripleorocky/coreos-kube-state-metrics:latest
- imagename: docker.io/grafana/grafana:latest
- imagename: docker.io/tripleorocky/coreos-kube-state-metrics:v1.3.1
- imagename: docker.io/grafana/grafana:5.2.1

18
tripleo_common/tests/image/test_kolla_builder.py
View File

@ -203,21 +203,21 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'openshift_configmap_reload_namespace':
'docker.io/tripleorocky',
'openshift_configmap_reload_image': 'coreos-configmap-reload',
'openshift_configmap_reload_tag': 'latest',
'openshift_configmap_reload_tag': 'v0.0.1',
'openshift_prometheus_operator_namespace':
'docker.io/tripleorocky',
'openshift_prometheus_operator_image':
'coreos-prometheus-operator',
'openshift_prometheus_operator_tag': 'latest',
'openshift_prometheus_operator_tag': 'v0.23.2',
'openshift_prometheus_config_reload_namespace':
'docker.io/tripleorocky',
'openshift_prometheus_config_reload_image':
'coreos-prometheus-config-reloader',
'openshift_prometheus_config_reload_tag': 'v0.24.0',
'openshift_prometheus_tag': 'latest',
'openshift_prometheus_alertmanager_tag': 'latest',
'openshift_prometheus_node_exporter_tag': 'latest',
'openshift_oauth_proxy_tag': 'latest',
'openshift_prometheus_config_reload_tag': 'v0.23.2',
'openshift_prometheus_tag': 'v2.3.2',
'openshift_prometheus_alertmanager_tag': 'v0.15.2',
'openshift_prometheus_node_exporter_tag': 'v0.16.0',
'openshift_oauth_proxy_tag': 'v1.1.0',
'openshift_kube_rbac_proxy_namespace':
'docker.io/tripleorocky',
'openshift_kube_rbac_proxy_image': 'coreos-kube-rbac-proxy',
@ -226,9 +226,9 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'docker.io/tripleorocky',
'openshift_kube_state_metrics_image':
'coreos-kube-state-metrics',
'openshift_kube_state_metrics_tag': 'latest',
'openshift_kube_state_metrics_tag': 'v1.3.1',
'openshift_grafana_namespace': 'docker.io/grafana',
'openshift_grafana_tag': 'latest',
'openshift_grafana_tag': '5.2.1',
},
builder.container_images_template_inputs()
)