From 5f5e988fb3d19f6839b5f683e5abd39c0f39b28b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Mon, 13 May 2019 11:13:55 +0200 Subject: [PATCH] Point to OSH-images images We now have a process for OSH-images image building, using Zuul, so we should point the images by default to those images, instead of pointing to stale images. Without this, the osh-images build process is completely not in use (and completely opaque to deployers), and updating the osh-images process or patching its code has no impact on OSH. This should fix it. Change-Id: Ic00bd98c151669dc2485cd88e0e8c2ab05445959 --- ceph-rgw/values.yaml | 6 +++--- elasticsearch/values.yaml | 14 +++++++------- fluent-logging/values.yaml | 4 ++-- gnocchi/values.yaml | 8 ++++---- grafana/values.yaml | 6 +++--- ingress/values.yaml | 4 ++-- kibana/values.yaml | 2 +- kubernetes-keystone-webhook/values.yaml | 2 +- libvirt/values.yaml | 2 +- mariadb/values.yaml | 6 +++--- openvswitch/values.yaml | 4 ++-- prometheus-openstack-exporter/values.yaml | 2 +- prometheus/values.yaml | 2 +- rabbitmq/values.yaml | 4 ++-- 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml index c993423e9..72296be1a 100644 --- a/ceph-rgw/values.yaml +++ b/ceph-rgw/values.yaml @@ -30,9 +30,9 @@ images: dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1' image_repo_sync: 'docker.io/docker:17.07.0' rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' - ks_endpoints: 'docker.io/openstackhelm/heat:newton' - ks_service: 'docker.io/openstackhelm/heat:newton' - ks_user: 'docker.io/openstackhelm/heat:newton' + ks_endpoints: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial' + ks_service: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial' + ks_user: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial' local_registry: active: false exclude: diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index f8bd72f67..f783350cf 100644 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -19,17 +19,17 @@ images: tags: apache_proxy: docker.io/httpd:2.4 - memory_init: docker.io/openstackhelm/heat:newton + memory_init: docker.io/openstackhelm/heat:newton-ubuntu_xenial curator: docker.io/bobrik/curator:5.6.0 elasticsearch: docker.io/srwilkers/elasticsearch-s3:v0.1.0 - ceph_key_placement: docker.io/port/ceph-config-helper:v1.10.3 - s3_bucket: docker.io/openstackhelm/ceph-daemon:latest - s3_user: docker.io/port/ceph-config-helper:v1.10.3 - helm_tests: docker.io/openstackhelm/heat:newton + ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial + s3_bucket: docker.io/openstackhelm/ceph-daemon:latest-ubuntu_xenial + s3_user: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial + helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial prometheus_elasticsearch_exporter: docker.io/justwatch/elasticsearch_exporter:1.0.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - snapshot_repository: docker.io/port/ceph-config-helper:v1.10.3 - es_cluster_wait: docker.io/port/ceph-config-helper:v1.10.3 + snapshot_repository: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial + es_cluster_wait: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" local_registry: diff --git a/fluent-logging/values.yaml b/fluent-logging/values.yaml index 592998504..e1c01703d 100644 --- a/fluent-logging/values.yaml +++ b/fluent-logging/values.yaml @@ -41,8 +41,8 @@ images: fluentd: docker.io/fluent/fluentd-kubernetes-daemonset:v1.2-debian-elasticsearch prometheus_fluentd_exporter: docker.io/bitnami/fluentd-exporter:0.2.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - helm_tests: docker.io/openstackhelm/heat:newton - elasticsearch_template: docker.io/openstackhelm/heat:newton + helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial + elasticsearch_template: docker.io/openstackhelm/heat:newton-ubuntu_xenial image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index b8158f085..a4496b7a3 100644 --- a/gnocchi/values.yaml +++ b/gnocchi/values.yaml @@ -38,15 +38,15 @@ release_group: null images: tags: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - gnocchi_storage_init: docker.io/port/ceph-config-helper:v1.10.3 + gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial db_init_indexer: docker.io/postgres:9.5 # using non-kolla images until kolla supports postgres as # an indexer db_init: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 db_sync: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton + ks_user: docker.io/openstackhelm/heat:newton-ubuntu_xenial + ks_service: docker.io/openstackhelm/heat:newton-ubuntu_xenial + ks_endpoints: docker.io/openstackhelm/heat:newton-ubuntu_xenial gnocchi_api: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 gnocchi_statsd: quay.io/attcomdev/ubuntu-source-gnocchi-statsd:3.0.3 gnocchi_metricd: quay.io/attcomdev/ubuntu-source-gnocchi-metricd:3.0.3 diff --git a/grafana/values.yaml b/grafana/values.yaml index 76aba9c33..67be70452 100644 --- a/grafana/values.yaml +++ b/grafana/values.yaml @@ -20,9 +20,9 @@ images: tags: grafana: docker.io/grafana/grafana:5.0.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - db_init: docker.io/openstackhelm/heat:newton - grafana_db_session_sync: docker.io/openstackhelm/heat:newton - helm_tests: docker.io/openstackhelm/heat:newton + db_init: docker.io/openstackhelm/heat:newton-ubuntu_xenial + grafana_db_session_sync: docker.io/openstackhelm/heat:newton-ubuntu_xenial + helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/ingress/values.yaml b/ingress/values.yaml index 5e6522e92..afcaf3624 100644 --- a/ingress/values.yaml +++ b/ingress/values.yaml @@ -27,8 +27,8 @@ images: tags: entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.23.0 - ingress_module_init: docker.io/openstackhelm/neutron:ocata - ingress_routed_vip: docker.io/openstackhelm/neutron:ocata + ingress_module_init: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial + ingress_routed_vip: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial error_pages: gcr.io/google_containers/defaultbackend:1.0 keepalived: docker.io/osixia/keepalived:1.4.5 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 diff --git a/kibana/values.yaml b/kibana/values.yaml index c808aacf4..5e6728d00 100644 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -26,7 +26,7 @@ images: kibana: docker.io/kibana:5.6.4 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 - register_kibana_indexes: docker.io/openstackhelm/heat:newton + register_kibana_indexes: docker.io/openstackhelm/heat:newton-ubuntu_xenial pull_policy: IfNotPresent local_registry: active: false diff --git a/kubernetes-keystone-webhook/values.yaml b/kubernetes-keystone-webhook/values.yaml index 5176d94c9..ea828aaed 100644 --- a/kubernetes-keystone-webhook/values.yaml +++ b/kubernetes-keystone-webhook/values.yaml @@ -23,7 +23,7 @@ labels: images: tags: kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:v0.2.0 - scripted_test: docker.io/openstackhelm/heat:newton + scripted_test: docker.io/openstackhelm/heat:newton-ubuntu_xenial dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent diff --git a/libvirt/values.yaml b/libvirt/values.yaml index 9b1246af6..6d2d2a4ac 100644 --- a/libvirt/values.yaml +++ b/libvirt/values.yaml @@ -27,7 +27,7 @@ labels: images: tags: - libvirt: docker.io/openstackhelm/libvirt:ubuntu-xenial-1.3.1-1ubuntu10.24 + libvirt: docker.io/openstackhelm/libvirt:latest-ubuntu_xenial dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/mariadb/values.yaml b/mariadb/values.yaml index 4a2c44bdf..a41d08aa3 100644 --- a/mariadb/values.yaml +++ b/mariadb/values.yaml @@ -26,11 +26,11 @@ images: error_pages: gcr.io/google_containers/defaultbackend:1.0 prometheus_create_mysql_user: docker.io/mariadb:10.2.13 prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.10.0 - prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton + prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 - mariadb_backup: docker.io/openstackhelm/mariadb:10.2.18 - scripted_test: docker.io/openstackhelm/mariadb:10.2.18 + mariadb_backup: docker.io/openstackhelm/mariadb:latest-ubuntu_xenial + scripted_test: docker.io/openstackhelm/mariadb:latest-ubuntu_xenial pull_policy: "IfNotPresent" local_registry: active: false diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml index 44eb47e36..cf3e953e2 100644 --- a/openvswitch/values.yaml +++ b/openvswitch/values.yaml @@ -21,8 +21,8 @@ release_group: null images: tags: - openvswitch_db_server: docker.io/openstackhelm/openvswitch:v2.8.1 - openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:v2.8.1 + openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-debian + openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-debian dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/prometheus-openstack-exporter/values.yaml b/prometheus-openstack-exporter/values.yaml index 1bcd81cb8..0b6329684 100644 --- a/prometheus-openstack-exporter/values.yaml +++ b/prometheus-openstack-exporter/values.yaml @@ -21,7 +21,7 @@ images: prometheus_openstack_exporter: quay.io/attcomdev/prometheus-openstack-exporter:3231f14419f0c47547ce2551b7d884cd222104e6 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 - ks_user: docker.io/openstackhelm/heat:newton + ks_user: docker.io/openstackhelm/heat:newton-ubuntu_xenial pull_policy: IfNotPresent local_registry: active: false diff --git a/prometheus/values.yaml b/prometheus/values.yaml index 2cd3463b5..bd9a85a67 100644 --- a/prometheus/values.yaml +++ b/prometheus/values.yaml @@ -21,7 +21,7 @@ images: tags: apache_proxy: docker.io/httpd:2.4 prometheus: docker.io/prom/prometheus:v2.3.2 - helm_tests: docker.io/openstackhelm/heat:newton + helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index f2868c7c7..117bea196 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -34,8 +34,8 @@ labels: images: tags: prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.21.0 - prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:ocata - rabbitmq_init: docker.io/openstackhelm/heat:ocata + prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:ocata-ubuntu_xenial + rabbitmq_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial rabbitmq: docker.io/rabbitmq:3.7.13 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 scripted_test: docker.io/rabbitmq:3.7.13-management