Add container images for openshift 3.11

This adds the necessary images and tag they appropriately for the related OpenShift services they will be used by. origin and node images are not updated anymore on the dockerhub starting from 3.11 and are replaced by origin-control-plane and origin-node. As a result, openshift_base_image var was renamed openshift_prefix, and DockerOpenShiftBaseImage heat param was renamed DockerOpenShiftControlPlaneImage. The coreos images are normally hosted on quay.io but were copied over to the dockerhub to workaround bug #1799396. Change-Id: Ibbd5ff9d3597f5add440b92a27a2f2f669f7bdbe
2018-10-15 19:06:01 +02:00 · 2018-10-15 19:06:01 +02:00 · 042a28195f
parent 131e0cf098
commit 042a28195f
4 changed files with 254 additions and 41 deletions
--- a/container-images/container_image_prepare_defaults.yaml
+++ b/container-images/container_image_prepare_defaults.yaml
@ -32,8 +32,8 @@ parameter_defaults:
      # Container image name components for OpenShift images.
      # Only used if OpenShift is deployed.
      openshift_namespace: docker.io/openshift
-      openshift_tag: v3.10.0
-      openshift_base_image: origin
+      openshift_tag: v3.11.0
+      openshift_prefix: origin
      openshift_cockpit_namespace: docker.io/cockpit
      openshift_cockpit_image: kubernetes
      openshift_cockpit_tag: latest
@ -47,3 +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_tag: v0.1.1
+      openshift_configmap_reload_namespace: docker.io/tripleomaster
+      openshift_configmap_reload_image: coreos-configmap-reload
+      openshift_configmap_reload_tag: latest
+      openshift_prometheus_operator_namespace: docker.io/tripleomaster
+      openshift_prometheus_operator_image: coreos-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_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_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_tag: latest
+      openshift_grafana_namespace: docker.io/grafana
+      openshift_grafana_tag: latest
--- a/container-images/overcloud_containers.yaml
+++ b/container-images/overcloud_containers.yaml
@ -106,17 +106,29 @@ container_images:
 - imagename: docker.io/ceph/daemon:v3.1.0-stable-3.1-luminous-centos-7-x86_64
 - imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo
 - imagename: docker.io/tripleomaster/centos-binary-rsyslog-base:current-tripleo
- imagename: docker.io/openshift/origin:v3.10.0
- imagename: docker.io/openshift/node:v3.10.0
- imagename: docker.io/openshift/origin-ansible:v3.10.0
- imagename: docker.io/openshift/origin-deployer:v3.10.0
- imagename: docker.io/openshift/origin-docker-builder:v3.10.0
- imagename: docker.io/openshift/origin-docker-registry:v3.10.0
- imagename: docker.io/openshift/origin-haproxy-router:v3.10.0
- imagename: docker.io/openshift/origin-pod:v3.10.0
- imagename: docker.io/openshift/origin-web-console:v3.10.0
+- imagename: docker.io/openshift/origin-ansible:v3.11.0
+- imagename: docker.io/openshift/origin-console:v3.11.0
+- imagename: docker.io/openshift/origin-control-plane:v3.11.0
+- imagename: docker.io/openshift/origin-deployer:v3.11.0
+- imagename: docker.io/openshift/origin-docker-builder:v3.11.0
+- imagename: docker.io/openshift/origin-docker-registry:v3.11.0
+- imagename: docker.io/openshift/origin-haproxy-router:v3.11.0
+- imagename: docker.io/openshift/origin-node:v3.11.0
+- imagename: docker.io/openshift/origin-pod:v3.11.0
+- imagename: docker.io/openshift/origin-web-console:v3.11.0
 - imagename: docker.io/cockpit/kubernetes:latest
 - imagename: registry.fedoraproject.org/latest/etcd:latest
 - 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: 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: docker.io/grafana/grafana:latest
--- a/container-images/overcloud_containers.yaml.j2
+++ b/container-images/overcloud_containers.yaml.j2
@ -798,27 +798,25 @@ container_images_template:
  - OS::TripleO::Services::SwiftProxy
  - OS::TripleO::Services::SwiftStorage

- imagename: "{{openshift_namespace}}/{{openshift_base_image}}:{{openshift_tag}}"
-  params:
-  - DockerOpenShiftBaseImage
-  services:
-  - OS::TripleO::Services::OpenShift::Master
-
- imagename: "{{openshift_namespace}}/node:{{openshift_tag}}"
-  params:
-  - DockerOpenShiftNodeImage
-  services:
-  - OS::TripleO::Services::OpenShift::Infra
-  - OS::TripleO::Services::OpenShift::Master
-  - OS::TripleO::Services::OpenShift::Worker
-
- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-ansible:{{openshift_tag}}"
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-ansible:{{openshift_tag}}"
  params:
  - DockerOpenShiftAnsibleImage
  services:
  - OS::TripleO::Services::OpenShift::Master

- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-deployer:{{openshift_tag}}"
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-console:{{openshift_tag}}"
+  params:
+  - DockerOpenShiftConsoleImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-control-plane:{{openshift_tag}}"
+  params:
+  - DockerOpenShiftControlPlaneImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-deployer:{{openshift_tag}}"
  params:
  - DockerOpenShiftDeployerImage
  services:
@ -826,25 +824,33 @@ container_images_template:
  - OS::TripleO::Services::OpenShift::Master
  - OS::TripleO::Services::OpenShift::Worker

- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-docker-builder:{{openshift_tag}}"
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-docker-builder:{{openshift_tag}}"
  params:
  - DockerOpenShiftDockerBuilderImage
  services:
  - OS::TripleO::Services::OpenShift::Worker

- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-docker-registry:{{openshift_tag}}"
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-docker-registry:{{openshift_tag}}"
  params:
  - DockerOpenShiftDockerRegistryImage
  services:
  - OS::TripleO::Services::OpenShift::Infra

- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-haproxy-router:{{openshift_tag}}"
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-haproxy-router:{{openshift_tag}}"
  params:
  - DockerOpenShiftHAProxyRouterImage
  services:
  - OS::TripleO::Services::OpenShift::Infra

- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-pod:{{openshift_tag}}"
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-node:{{openshift_tag}}"
+  params:
+  - DockerOpenShiftNodeImage
+  services:
+  - OS::TripleO::Services::OpenShift::Infra
+  - OS::TripleO::Services::OpenShift::Master
+  - OS::TripleO::Services::OpenShift::Worker
+
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-pod:{{openshift_tag}}"
  params:
  - DockerOpenShiftPodImage
  services:
@ -852,7 +858,7 @@ container_images_template:
  - OS::TripleO::Services::OpenShift::Master
  - OS::TripleO::Services::OpenShift::Worker

- imagename: "{{openshift_namespace}}/{{openshift_base_image}}-web-console:{{openshift_tag}}"
+- imagename: "{{openshift_namespace}}/{{openshift_prefix}}-web-console:{{openshift_tag}}"
  params:
  - DockerOpenShiftWebConsoleImage
  services:
@ -887,3 +893,72 @@ container_images_template:
  - DockerOpenShiftGlusterFSHeketiImage
  services:
  - OS::TripleO::Services::OpenShift::GlusterFS
+
+- imagename: "{{openshift_cluster_monitoring_namespace}}/{{openshift_cluster_monitoring_image}}:{{openshift_cluster_monitoring_tag}}"
+  params:
+  - DockerOpenShiftClusterMonitorOperatorImage
+  services:
+  - OS::TripleO::Services::OpenShift::Infra
+
+- imagename: "{{openshift_configmap_reload_namespace}}/{{openshift_configmap_reload_image}}:{{openshift_configmap_reload_tag}}"
+  params:
+  - DockerOpenShiftConfigmapReloaderImage
+  services:
+  - OS::TripleO::Services::OpenShift::Infra
+
+- imagename: "{{openshift_prometheus_operator_namespace}}/{{openshift_prometheus_operator_image}}:{{openshift_prometheus_operator_tag}}"
+  params:
+  - DockerOpenShiftPrometheusOperatorImage
+  services:
+  - OS::TripleO::Services::OpenShift::Infra
+
+- imagename: "{{openshift_prometheus_config_reload_namespace}}/{{openshift_prometheus_config_reload_image}}:{{openshift_prometheus_config_reload_tag}}"
+  params:
+  - DockerOpenShiftPrometheusConfigReloaderImage
+  services:
+  - OS::TripleO::Services::OpenShift::Infra
+
+- imagename: "{{openshift_namespace}}/prometheus:{{openshift_prometheus_tag}}"
+  params:
+  - DockerOpenShiftPrometheusImage
+  services:
+  - OS::TripleO::Services::OpenShift::Infra
+
+- imagename: "{{openshift_namespace}}/prometheus-alertmanager:{{openshift_prometheus_alertmanager_tag}}"
+  params:
+  - DockerOpenShiftPrometheusAlertmanagerImage
+  services:
+  - OS::TripleO::Services::OpenShift::Infra
+
+- imagename: "{{openshift_namespace}}/prometheus-node-exporter:{{openshift_prometheus_node_exporter_tag}}"
+  params:
+  - DockerOpenShiftPrometheusNodeExporterImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+  - OS::TripleO::Services::OpenShift::Worker
+  - OS::TripleO::Services::OpenShift::Infra
+
+- imagename: "{{openshift_namespace}}/oauth-proxy:{{openshift_oauth_proxy_tag}}"
+  params:
+  - DockerOpenShiftOauthProxyImage
+  services:
+  - OS::TripleO::Services::OpenShift::Infra
+
+- imagename: "{{openshift_kube_rbac_proxy_namespace}}/{{openshift_kube_rbac_proxy_image}}:{{openshift_kube_rbac_proxy_tag}}"
+  params:
+  - DockerOpenShiftKubeRbacProxyImage
+  services:
+  - OS::TripleO::Services::OpenShift::Master
+  - OS::TripleO::Services::OpenShift::Worker
+
+- imagename: "{{openshift_kube_state_metrics_namespace}}/{{openshift_kube_state_metrics_image}}:{{openshift_kube_state_metrics_tag}}"
+  params:
+  - DockerOpenShiftKubeStateMetricsImage
+  services:
+  - OS::TripleO::Services::OpenShift::Infra
+
+- imagename: "{{openshift_grafana_namespace}}/grafana:{{openshift_grafana_tag}}"
+  params:
+  - DockerOpenShiftGrafanaImage
+  services:
+  - OS::TripleO::Services::OpenShift::Infra
--- a/tripleo_common/tests/image/test_kolla_builder.py
+++ b/tripleo_common/tests/image/test_kolla_builder.py
@ -179,8 +179,8 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                'tag': 'current-tripleo',
                'neutron_driver': None,
                'openshift_namespace': 'docker.io/openshift',
-                'openshift_tag': 'v3.10.0',
-                'openshift_base_image': 'origin',
+                'openshift_tag': 'v3.11.0',
+                'openshift_prefix': 'origin',
                'openshift_cockpit_namespace': 'docker.io/cockpit',
                'openshift_cockpit_image': 'kubernetes',
                'openshift_cockpit_tag': 'latest',
@ -195,6 +195,40 @@ 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_image':
+                    'coreos-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_tag': 'latest',
+                'openshift_prometheus_operator_namespace':
+                    'docker.io/tripleomaster',
+                'openshift_prometheus_operator_image':
+                    'coreos-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_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_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_tag': 'latest',
+                'openshift_grafana_namespace': 'docker.io/grafana',
+                'openshift_grafana_tag': 'latest',
            },
            builder.container_images_template_inputs()
        )
@ -210,8 +244,8 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                'tag': 'master',
                'neutron_driver': 'ovn',
                'openshift_namespace': 'docker.io/openshift3',
-                'openshift_tag': 'v3.10.0',
-                'openshift_base_image': 'ose',
+                'openshift_tag': 'v3.11.0',
+                'openshift_prefix': 'ose',
                'openshift_cockpit_namespace': 'docker.io/openshift-cockpit',
                'openshift_cockpit_image': 'cockpit',
                'openshift_cockpit_tag': 'cockpit-tag',
@ -219,15 +253,49 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                'openshift_etcd_image': 'openshift-etcd',
                'openshift_etcd_tag': 'etcd-tag',
                'openshift_gluster_namespace':
-                'registry.access.redhat.com/rhgs3',
+                    'registry.access.redhat.com/rhgs3',
                'openshift_gluster_image': 'rhgs-server-rhel7',
                'openshift_gluster_block_image':
-                'rhgs-gluster-block-prov-rhel7',
+                    'rhgs-gluster-block-prov-rhel7',
                'openshift_gluster_tag': 'gluster-tag',
                'openshift_heketi_namespace':
-                'registry.access.redhat.com/rhgs3',
+                    'registry.access.redhat.com/rhgs3',
                'openshift_heketi_image': 'rhgs-volmanager-rhel7',
                'openshift_heketi_tag': 'heketi-tag',
+                'openshift_cluster_monitoring_namespace':
+                    'registry.access.redhat.com/openshift3',
+                'openshift_cluster_monitoring_image':
+                    'ose-cluster-monitoring-operator',
+                'openshift_cluster_monitoring_tag': 'v3.11',
+                'openshift_configmap_reload_namespace':
+                    'registry.access.redhat.com/openshift3',
+                'openshift_configmap_reload_image': 'ose-configmap-reloader',
+                'openshift_configmap_reload_tag': 'v3.11',
+                'openshift_prometheus_operator_namespace':
+                    'registry.access.redhat.com/openshift3',
+                'openshift_prometheus_operator_image':
+                    'ose-prometheus-operator',
+                'openshift_prometheus_operator_tag': 'v3.11',
+                'openshift_prometheus_config_reload_namespace':
+                    'registry.access.redhat.com/openshift3',
+                'openshift_prometheus_config_reload_image':
+                    'ose-prometheus-config-reloader',
+                'openshift_prometheus_config_reload_tag': 'v3.11',
+                'openshift_prometheus_tag': 'v3.11',
+                'openshift_prometheus_alertmanager_tag': 'v3.11',
+                'openshift_prometheus_node_exporter_tag': 'v3.11',
+                'openshift_oauth_proxy_tag': 'v3.11',
+                'openshift_kube_rbac_proxy_namespace':
+                    'registry.access.redhat.com/openshift3',
+                'openshift_kube_rbac_proxy_image': 'ose-kube-rbac-proxy',
+                'openshift_kube_rbac_proxy_tag': 'v3.11',
+                'openshift_kube_state_metrics_namespace':
+                    'registry.access.redhat.com/openshift3',
+                'openshift_kube_state_metrics_image': 'ose-kube-state-metrics',
+                'openshift_kube_state_metrics_tag': 'v3.11',
+                'openshift_grafana_namespace':
+                    'registry.access.redhat.com/openshift3',
+                'openshift_grafana_tag': 'v3.11',
            },
            builder.container_images_template_inputs(
                namespace='192.0.2.0:5000/tripleomaster',
@ -239,8 +307,8 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                tag='master',
                neutron_driver='ovn',
                openshift_namespace='docker.io/openshift3',
-                openshift_tag='v3.10.0',
-                openshift_base_image='ose',
+                openshift_tag='v3.11.0',
+                openshift_prefix='ose',
                openshift_cockpit_namespace='docker.io/openshift-cockpit',
                openshift_cockpit_image='cockpit',
                openshift_cockpit_tag='cockpit-tag',
@ -254,6 +322,40 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                openshift_heketi_namespace='registry.access.redhat.com/rhgs3',
                openshift_heketi_image='rhgs-volmanager-rhel7',
                openshift_heketi_tag='heketi-tag',
+                openshift_cluster_monitoring_namespace='registry.'
+                    'access.redhat.com/openshift3',
+                openshift_cluster_monitoring_image='ose-'
+                    'cluster-monitoring-operator',
+                openshift_cluster_monitoring_tag='v3.11',
+                openshift_configmap_reload_namespace='registry.'
+                    'access.redhat.com/openshift3',
+                openshift_configmap_reload_image='ose-configmap-reloader',
+                openshift_configmap_reload_tag='v3.11',
+                openshift_prometheus_operator_namespace='registry.'
+                    'access.redhat.com/openshift3',
+                openshift_prometheus_operator_image='ose-'
+                    'prometheus-operator',
+                openshift_prometheus_operator_tag='v3.11',
+                openshift_prometheus_config_reload_namespace='registry.'
+                    'access.redhat.com/openshift3',
+                openshift_prometheus_config_reload_image='ose-'
+                    'prometheus-config-reloader',
+                openshift_prometheus_config_reload_tag='v3.11',
+                openshift_prometheus_tag='v3.11',
+                openshift_prometheus_alertmanager_tag='v3.11',
+                openshift_prometheus_node_exporter_tag='v3.11',
+                openshift_oauth_proxy_tag='v3.11',
+                openshift_kube_rbac_proxy_namespace='registry.'
+                    'access.redhat.com/openshift3',
+                openshift_kube_rbac_proxy_image='ose-kube-rbac-proxy',
+                openshift_kube_rbac_proxy_tag='v3.11',
+                openshift_kube_state_metrics_namespace='registry.'
+                    'access.redhat.com/openshift3',
+                openshift_kube_state_metrics_image='ose-kube-state-metrics',
+                openshift_kube_state_metrics_tag='v3.11',
+                openshift_grafana_namespace='registry.'
+                    'access.redhat.com/openshift3',
+                openshift_grafana_tag='v3.11',
            )
        )