openstack
/
tripleo-common
Code Issues Proposed changes

Revert to coreos images hosted on quay.io 

This changes the image source for the container images hosted on
quay.io back to their upstream values.

Change-Id: I4e9c9f1a844252d013331bba6b4c1b5c4ea9430b
Depends-On: I4c64848c7eb21cd4370c9be72cea842863513c01
This commit is contained in:
Martin André 2018-11-04 08:45:53 +01:00
parent 042a28195f
commit f3cff1560b
3 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
container-images/container_image_prepare_defaults.yaml
View File

@ -47,27 +47,27 @@ parameter_defaults:
openshift_heketi_namespace: docker.io/heketi
openshift_heketi_image: heketi
openshift_heketi_tag: latest
openshift_cluster_monitoring_namespace: docker.io/tripleomaster
openshift_cluster_monitoring_image: coreos-cluster-monitoring-operator
openshift_cluster_monitoring_namespace: quay.io/coreos
openshift_cluster_monitoring_image: cluster-monitoring-operator
openshift_cluster_monitoring_tag: v0.1.1
openshift_configmap_reload_namespace: docker.io/tripleomaster
openshift_configmap_reload_image: coreos-configmap-reload
openshift_configmap_reload_namespace: quay.io/coreos
openshift_configmap_reload_image: configmap-reload
openshift_configmap_reload_tag: latest
openshift_prometheus_operator_namespace: docker.io/tripleomaster
openshift_prometheus_operator_image: coreos-prometheus-operator
openshift_prometheus_operator_namespace: quay.io/coreos
openshift_prometheus_operator_image: prometheus-operator
openshift_prometheus_operator_tag: latest
openshift_prometheus_config_reload_namespace: docker.io/tripleomaster
openshift_prometheus_config_reload_image: coreos-prometheus-config-reloader
openshift_prometheus_config_reload_namespace: quay.io/coreos
openshift_prometheus_config_reload_image: 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_kube_rbac_proxy_namespace: docker.io/tripleomaster
openshift_kube_rbac_proxy_image: coreos-kube-rbac-proxy
openshift_kube_rbac_proxy_namespace: quay.io/coreos
openshift_kube_rbac_proxy_image: kube-rbac-proxy
openshift_kube_rbac_proxy_tag: v0.3.1
openshift_kube_state_metrics_namespace: docker.io/tripleomaster
openshift_kube_state_metrics_image: coreos-kube-state-metrics
openshift_kube_state_metrics_namespace: quay.io/coreos
openshift_kube_state_metrics_image: kube-state-metrics
openshift_kube_state_metrics_tag: latest
openshift_grafana_namespace: docker.io/grafana
openshift_grafana_tag: latest

12
container-images/overcloud_containers.yaml
View File

@ -121,14 +121,14 @@ container_images:
- imagename: docker.io/gluster/gluster-centos:latest
- imagename: docker.io/gluster/glusterblock-provisioner:latest
- imagename: docker.io/heketi/heketi:latest
- imagename: docker.io/tripleomaster/coreos-cluster-monitoring-operator:v0.1.1
- imagename: docker.io/tripleomaster/coreos-configmap-reload:latest
- imagename: docker.io/tripleomaster/coreos-prometheus-operator:latest
- imagename: docker.io/tripleomaster/coreos-prometheus-config-reloader:v0.24.0
- imagename: quay.io/coreos/cluster-monitoring-operator:v0.1.1
- imagename: quay.io/coreos/configmap-reload:latest
- imagename: quay.io/coreos/prometheus-operator:latest
- imagename: quay.io/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/tripleomaster/coreos-kube-rbac-proxy:v0.3.1
- imagename: docker.io/tripleomaster/coreos-kube-state-metrics:latest
- imagename: quay.io/coreos/kube-rbac-proxy:v0.3.1
- imagename: quay.io/coreos/kube-state-metrics:latest
- imagename: docker.io/grafana/grafana:latest

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

@ -195,37 +195,30 @@ class TestKollaImageBuilderTemplate(base.TestCase):
'openshift_heketi_namespace': 'docker.io/heketi',
'openshift_heketi_image': 'heketi',
'openshift_heketi_tag': 'latest',
'openshift_cluster_monitoring_namespace':
'docker.io/tripleomaster',
'openshift_cluster_monitoring_namespace': 'quay.io/coreos',
'openshift_cluster_monitoring_image':
'coreos-cluster-monitoring-operator',
'cluster-monitoring-operator',
'openshift_cluster_monitoring_tag': 'v0.1.1',
'openshift_configmap_reload_namespace':
'docker.io/tripleomaster',
'openshift_configmap_reload_image': 'coreos-configmap-reload',
'openshift_configmap_reload_namespace': 'quay.io/coreos',
'openshift_configmap_reload_image': 'configmap-reload',
'openshift_configmap_reload_tag': 'latest',
'openshift_prometheus_operator_namespace':
'docker.io/tripleomaster',
'openshift_prometheus_operator_image':
'coreos-prometheus-operator',
'openshift_prometheus_operator_namespace': 'quay.io/coreos',
'openshift_prometheus_operator_image': 'prometheus-operator',
'openshift_prometheus_operator_tag': 'latest',
'openshift_prometheus_config_reload_namespace':
'docker.io/tripleomaster',
'quay.io/coreos',
'openshift_prometheus_config_reload_image':
'coreos-prometheus-config-reloader',
'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_kube_rbac_proxy_namespace':
'docker.io/tripleomaster',
'openshift_kube_rbac_proxy_image': 'coreos-kube-rbac-proxy',
'openshift_kube_rbac_proxy_namespace': 'quay.io/coreos',
'openshift_kube_rbac_proxy_image': 'kube-rbac-proxy',
'openshift_kube_rbac_proxy_tag': 'v0.3.1',
'openshift_kube_state_metrics_namespace':
'docker.io/tripleomaster',
'openshift_kube_state_metrics_image':
'coreos-kube-state-metrics',
'openshift_kube_state_metrics_namespace': 'quay.io/coreos',
'openshift_kube_state_metrics_image': 'kube-state-metrics',
'openshift_kube_state_metrics_tag': 'latest',
'openshift_grafana_namespace': 'docker.io/grafana',
'openshift_grafana_tag': 'latest',