diff --git a/api/client/v1beta1/openstackclient_types.go b/api/client/v1beta1/openstackclient_types.go index 650efc1bd..f6ffcdca3 100644 --- a/api/client/v1beta1/openstackclient_types.go +++ b/api/client/v1beta1/openstackclient_types.go @@ -27,7 +27,7 @@ const ( // Container image fall-back defaults // OpenStackClientContainerImage is the fall-back container image for OpenStackClient - OpenStackClientContainerImage = "quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified" + OpenStackClientContainerImage = "quay.io/openstack-s2i-containers/openstack-openstackclient:master-latest" ) // OpenStackClientSpec defines the desired state of OpenStackClient diff --git a/config/operator/default_images.yaml b/config/operator/default_images.yaml index 7282b05c4..48ca7288c 100644 --- a/config/operator/default_images.yaml +++ b/config/operator/default_images.yaml @@ -16,29 +16,15 @@ spec: - name: RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT value: quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest - name: RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-aodh-api:current-podified - - name: RELATED_IMAGE_AODH_EVALUATOR_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-aodh-evaluator:current-podified - - name: RELATED_IMAGE_AODH_LISTENER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-aodh-listener:current-podified - - name: RELATED_IMAGE_AODH_NOTIFIER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-aodh-notifier:current-podified + value: quay.io/openstack-s2i-containers/openstack-aodh-api:master-latest - name: RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT value: registry.redhat.io/ubi10/httpd-24:latest - name: RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-barbican-api:current-podified - - name: RELATED_IMAGE_BARBICAN_KEYSTONE_LISTENER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-barbican-keystone-listener:current-podified - - name: RELATED_IMAGE_BARBICAN_WORKER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-barbican-worker:current-podified + value: quay.io/openstack-s2i-containers/openstack-barbican-api:master-latest - name: RELATED_IMAGE_CEILOMETER_CENTRAL_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ceilometer-central:current-podified + value: quay.io/openstack-s2i-containers/openstack-ceilometer-central:master-latest - name: RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified - - name: RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified - - name: RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ceilometer-notification:current-podified + value: quay.io/openstack-s2i-containers/openstack-ceilometer-compute:master-latest - name: RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT value: quay.io/openstack-k8s-operators/mysqld_exporter:latest - name: RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT @@ -46,41 +32,35 @@ spec: - name: RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT value: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 - name: RELATED_IMAGE_CINDER_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-cinder-api:current-podified + value: quay.io/openstack-s2i-containers/openstack-cinder-api:master-latest - name: RELATED_IMAGE_CINDER_BACKUP_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-cinder-backup:current-podified + value: quay.io/openstack-s2i-containers/openstack-cinder-backup:master-latest - name: RELATED_IMAGE_CINDER_SCHEDULER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-cinder-scheduler:current-podified + value: quay.io/openstack-s2i-containers/openstack-cinder-scheduler:master-latest - name: RELATED_IMAGE_CINDER_VOLUME_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-cinder-volume:current-podified + value: quay.io/openstack-s2i-containers/openstack-cinder-volume:master-latest - name: RELATED_IMAGE_CLOUDKITTY_API_IMAGE_URL_DEFAULT - value: quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-api:current - - name: RELATED_IMAGE_CLOUDKITTY_PROC_IMAGE_URL_DEFAULT - value: quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-processor:current + value: quay.io/openstack-s2i-containers/openstack-cloudkitty-api:master-latest - name: RELATED_IMAGE_DESIGNATE_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-designate-api:current-podified + value: quay.io/openstack-s2i-containers/openstack-designate-api:master-latest - name: RELATED_IMAGE_DESIGNATE_BACKENDBIND9_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-designate-backend-bind9:current-podified + value: quay.io/openstack-s2i-containers/openstack-designate-backend-bind9:master-latest - name: RELATED_IMAGE_DESIGNATE_CENTRAL_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-designate-central:current-podified - - name: RELATED_IMAGE_DESIGNATE_MDNS_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-designate-mdns:current-podified - - name: RELATED_IMAGE_DESIGNATE_PRODUCER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-designate-producer:current-podified + value: quay.io/openstack-s2i-containers/openstack-designate-central:master-latest - name: RELATED_IMAGE_DESIGNATE_UNBOUND_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-unbound:current-podified + value: quay.io/openstack-s2i-containers/openstack-unbound:master-latest - name: RELATED_IMAGE_DESIGNATE_WORKER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-designate-worker:current-podified + value: quay.io/openstack-s2i-containers/openstack-designate-worker:master-latest - name: RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-frr:current-podified + value: quay.io/openstack-s2i-containers/openstack-frr:master-latest - name: RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified + value: quay.io/openstack-s2i-containers/openstack-neutron-dhcp-agent:master-latest - name: RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified + value: quay.io/openstack-s2i-containers/openstack-neutron-metadata-agent-ovn:master-latest - name: RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified + value: quay.io/openstack-s2i-containers/openstack-neutron-ovn-agent:master-latest - name: RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified + value: quay.io/openstack-s2i-containers/openstack-neutron-sriov-agent:master-latest - name: RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT value: quay.io/prometheus/node-exporter:v1.5.0 - name: RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT @@ -92,109 +72,97 @@ spec: - name: RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT value: quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest - name: RELATED_IMAGE_GLANCE_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-glance-api:current-podified + value: quay.io/openstack-s2i-containers/openstack-glance-api:master-latest - name: RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-heat-api:current-podified - - name: RELATED_IMAGE_HEAT_CFNAPI_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-heat-api-cfn:current-podified + value: quay.io/openstack-s2i-containers/openstack-heat-api:master-latest - name: RELATED_IMAGE_HEAT_ENGINE_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-heat-engine:current-podified + value: quay.io/openstack-s2i-containers/openstack-heat-engine:master-latest - name: RELATED_IMAGE_HORIZON_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-horizon:current-podified + value: quay.io/openstack-s2i-containers/openstack-horizon:master-latest - name: RELATED_IMAGE_INFRA_MEMCACHED_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-memcached:current-podified + value: quay.io/openstack-s2i-containers/openstack-memcached:master-latest - name: RELATED_IMAGE_INFRA_REDIS_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-redis:current-podified + value: quay.io/openstack-s2i-containers/openstack-redis:master-latest - name: RELATED_IMAGE_IRONIC_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ironic-api:current-podified + value: quay.io/openstack-s2i-containers/openstack-ironic-api:master-latest - name: RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ironic-conductor:current-podified + value: quay.io/openstack-s2i-containers/openstack-ironic-conductor:master-latest - name: RELATED_IMAGE_IRONIC_INSPECTOR_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/openstack-ironic-inspector:current-podified - name: RELATED_IMAGE_IRONIC_NEUTRON_AGENT_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ironic-neutron-agent:current-podified - - name: RELATED_IMAGE_IRONIC_PXE_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ironic-pxe:current-podified + value: quay.io/openstack-s2i-containers/openstack-ironic-neutron-agent:master-latest - name: RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/ironic-python-agent:current-podified - name: RELATED_IMAGE_KEYSTONE_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-keystone:current-podified + value: quay.io/openstack-s2i-containers/openstack-keystone:master-latest - name: RELATED_IMAGE_MANILA_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-manila-api:current-podified + value: quay.io/openstack-s2i-containers/openstack-manila-api:master-latest - name: RELATED_IMAGE_MANILA_SCHEDULER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-manila-scheduler:current-podified + value: quay.io/openstack-s2i-containers/openstack-manila-scheduler:master-latest - name: RELATED_IMAGE_MANILA_SHARE_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-manila-share:current-podified + value: quay.io/openstack-s2i-containers/openstack-manila-share:master-latest - name: RELATED_IMAGE_MARIADB_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-mariadb:current-podified + value: quay.io/openstack-s2i-containers/openstack-mariadb:master-latest - name: RELATED_IMAGE_NET_UTILS_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-netutils:current-podified + value: quay.io/openstack-s2i-containers/openstack-netutils:master-latest - name: RELATED_IMAGE_NEUTRON_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-neutron-server:current-podified + value: quay.io/openstack-s2i-containers/openstack-neutron-server:master-latest - name: RELATED_IMAGE_NOVA_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-nova-api:current-podified + value: quay.io/openstack-s2i-containers/openstack-nova-api:master-latest - name: RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified + value: quay.io/openstack-s2i-containers/openstack-nova-compute:master-latest - name: RELATED_IMAGE_NOVA_CONDUCTOR_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-nova-conductor:current-podified + value: quay.io/openstack-s2i-containers/openstack-nova-conductor:master-latest - name: RELATED_IMAGE_NOVA_NOVNC_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-nova-novncproxy:current-podified + value: quay.io/openstack-s2i-containers/openstack-nova-novncproxy:master-latest - name: RELATED_IMAGE_NOVA_SCHEDULER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-nova-scheduler:current-podified + value: quay.io/openstack-s2i-containers/openstack-nova-scheduler:master-latest - name: RELATED_IMAGE_OCTAVIA_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-octavia-api:current-podified - - name: RELATED_IMAGE_OCTAVIA_HEALTHMANAGER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-octavia-health-manager:current-podified - - name: RELATED_IMAGE_OCTAVIA_HOUSEKEEPING_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-octavia-housekeeping:current-podified + value: quay.io/openstack-s2i-containers/openstack-octavia-api:master-latest - name: RELATED_IMAGE_OCTAVIA_WORKER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-octavia-worker:current-podified + value: quay.io/openstack-s2i-containers/openstack-octavia-worker:master-latest - name: RELATED_IMAGE_OCTAVIA_RSYSLOG_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-rsyslog:current-podified + value: quay.io/openstack-s2i-containers/openstack-rsyslog:master-latest - name: RELATED_IMAGE_OPENSTACK_ASSISTANT_IMAGE_URL_DEFAULT value: quay.io/openstack-s2i-containers/openstack-goose:master-latest - name: RELATED_IMAGE_OPENSTACK_CLIENT_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified + value: quay.io/openstack-s2i-containers/openstack-openstackclient:master-latest - name: RELATED_IMAGE_OPENSTACK_MCP_IMAGE_URL_DEFAULT value: quay.io/openstack-lightspeed/lightspeed-mcps:latest - name: RELATED_IMAGE_OS_CONTAINER_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified - name: RELATED_IMAGE_OVN_CONTROLLER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified + value: quay.io/openstack-s2i-containers/openstack-ovn-controller:master-latest - name: RELATED_IMAGE_OVN_CONTROLLER_OVS_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ovn-base:current-podified + value: quay.io/openstack-s2i-containers/openstack-ovn-base:master-latest - name: RELATED_IMAGE_OVN_NB_DBCLUSTER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ovn-nb-db-server:current-podified + value: quay.io/openstack-s2i-containers/openstack-ovn-nb-db-server:master-latest - name: RELATED_IMAGE_OVN_NORTHD_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ovn-northd:current-podified + value: quay.io/openstack-s2i-containers/openstack-ovn-northd:master-latest - name: RELATED_IMAGE_OVN_SB_DBCLUSTER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ovn-sb-db-server:current-podified + value: quay.io/openstack-s2i-containers/openstack-ovn-sb-db-server:master-latest - name: RELATED_IMAGE_PLACEMENT_API_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-placement-api:current-podified + value: quay.io/openstack-s2i-containers/openstack-placement-api:master-latest - name: RELATED_IMAGE_RABBITMQ_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-rabbitmq:current-podified + value: quay.io/openstack-s2i-containers/openstack-rabbitmq:master-latest - name: RELATED_IMAGE_SWIFT_ACCOUNT_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-swift-account:current-podified + value: quay.io/openstack-s2i-containers/openstack-swift-account:master-latest - name: RELATED_IMAGE_SWIFT_CONTAINER_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-swift-container:current-podified + value: quay.io/openstack-s2i-containers/openstack-swift-container:master-latest - name: RELATED_IMAGE_SWIFT_OBJECT_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-swift-object:current-podified + value: quay.io/openstack-s2i-containers/openstack-swift-object:master-latest - name: RELATED_IMAGE_SWIFT_PROXY_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-swift-proxy-server:current-podified + value: quay.io/openstack-s2i-containers/openstack-swift-proxy-server:master-latest - name: RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified - - name: RELATED_IMAGE_WATCHER_API_IMAGE_URL_DEFAULT - value: quay.io/podified-master-centos9/openstack-watcher-api:current-podified - - name: RELATED_IMAGE_WATCHER_APPLIER_IMAGE_URL_DEFAULT - value: quay.io/podified-master-centos9/openstack-watcher-applier:current-podified - - name: RELATED_IMAGE_WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT - value: quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified + value: quay.io/openstack-s2i-containers/openstack-tempest:master-latest + - name: RELATED_IMAGE_WATCHER_BASE_IMAGE_URL_DEFAULT + value: quay.io/openstack-s2i-containers/openstack-watcher-base:master-latest # NOTE: TEST_ images below do not get released downstream. They should not be prefixed with RELATED - name: TEST_TOBIKO_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-tobiko:current-podified + value: quay.io/openstack-s2i-containers/openstack-tobiko:master-latest - name: TEST_ANSIBLETEST_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified + value: quay.io/openstack-s2i-containers/openstack-ansible-test:master-latest - name: TEST_HORIZONTEST_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-horizontest:current-podified + value: quay.io/openstack-s2i-containers/openstack-horizontest:master-latest - name: RELATED_IMAGE_OPENSTACK_MUST_GATHER_DEFAULT value: quay.io/openstack-k8s-operators/openstack-must-gather:latest diff --git a/hack/export_related_images.sh b/hack/export_related_images.sh index b1f4333be..352f2c7ab 100755 --- a/hack/export_related_images.sh +++ b/hack/export_related_images.sh @@ -1,96 +1,80 @@ #!/bin/bash export OPENSTACK_RELEASE_VERSION=0.0.1-$(date +%s) -export RELATED_IMAGE_OPENSTACK_CLIENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified -export RELATED_IMAGE_RABBITMQ_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-rabbitmq:current-podified -export RELATED_IMAGE_KEYSTONE_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-keystone:current-podified -export RELATED_IMAGE_MARIADB_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-mariadb:current-podified -export RELATED_IMAGE_INFRA_MEMCACHED_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-memcached:current-podified -export RELATED_IMAGE_INFRA_REDIS_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-redis:current-podified +export RELATED_IMAGE_OPENSTACK_CLIENT_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-openstackclient:master-latest +export RELATED_IMAGE_RABBITMQ_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-rabbitmq:master-latest +export RELATED_IMAGE_KEYSTONE_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-keystone:master-latest +export RELATED_IMAGE_MARIADB_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-mariadb:master-latest +export RELATED_IMAGE_INFRA_MEMCACHED_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-memcached:master-latest +export RELATED_IMAGE_INFRA_REDIS_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-redis:master-latest export RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/openstack-ansibleee-runner:current-podified -export RELATED_IMAGE_NOVA_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-nova-api:current-podified -export RELATED_IMAGE_NOVA_CONDUCTOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-nova-conductor:current-podified -export RELATED_IMAGE_NOVA_NOVNC_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-nova-novncproxy:current-podified -export RELATED_IMAGE_NOVA_SCHEDULER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-nova-scheduler:current-podified -export RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified -export RELATED_IMAGE_NEUTRON_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-server:current-podified -export RELATED_IMAGE_MANILA_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-manila-api:current-podified -export RELATED_IMAGE_MANILA_SCHEDULER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-manila-scheduler:current-podified -export RELATED_IMAGE_MANILA_SHARE_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-manila-share:current-podified -export RELATED_IMAGE_GLANCE_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-glance-api:current-podified -export RELATED_IMAGE_IRONIC_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-api:current-podified -export RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-conductor:current-podified +export RELATED_IMAGE_NOVA_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-nova-api:master-latest +export RELATED_IMAGE_NOVA_CONDUCTOR_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-nova-conductor:master-latest +export RELATED_IMAGE_NOVA_NOVNC_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-nova-novncproxy:master-latest +export RELATED_IMAGE_NOVA_SCHEDULER_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-nova-scheduler:master-latest +export RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-nova-compute:master-latest +export RELATED_IMAGE_NEUTRON_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-neutron-server:master-latest +export RELATED_IMAGE_MANILA_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-manila-api:master-latest +export RELATED_IMAGE_MANILA_SCHEDULER_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-manila-scheduler:master-latest +export RELATED_IMAGE_MANILA_SHARE_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-manila-share:master-latest +export RELATED_IMAGE_GLANCE_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-glance-api:master-latest +export RELATED_IMAGE_IRONIC_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ironic-api:master-latest +export RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ironic-conductor:master-latest export RELATED_IMAGE_IRONIC_INSPECTOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-inspector:current-podified -export RELATED_IMAGE_IRONIC_PXE_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-pxe:current-podified -export RELATED_IMAGE_IRONIC_NEUTRON_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-neutron-agent:current-podified +export RELATED_IMAGE_IRONIC_NEUTRON_AGENT_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ironic-neutron-agent:master-latest export RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/ironic-python-agent:current-podified export RELATED_IMAGE_OS_CONTAINER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified export RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified export RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT=registry.redhat.io/ubi10/httpd-24:latest export OS_IMAGE_DEFAULT=edpm-hardened-uefi.qcow2 -export RELATED_IMAGE_PLACEMENT_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-placement-api:current-podified -export RELATED_IMAGE_CEILOMETER_CENTRAL_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-central:current-podified -export RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified -export RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-notification:current-podified -export RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified +export RELATED_IMAGE_PLACEMENT_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-placement-api:master-latest +export RELATED_IMAGE_CEILOMETER_CENTRAL_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ceilometer-central:master-latest +export RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ceilometer-compute:master-latest export RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/sg-core:latest export RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/mysqld_exporter:latest export RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT=registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 -export RELATED_IMAGE_CLOUDKITTY_API_IMAGE_URL_DEFAULT=quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-api:current -export RELATED_IMAGE_CLOUDKITTY_PROCESSOR_IMAGE_URL_DEFAULT=quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-processor:current -export RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-api:current-podified -export RELATED_IMAGE_AODH_EVALUATOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-evaluator:current-podified -export RELATED_IMAGE_AODH_NOTIFIER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-notifier:current-podified -export RELATED_IMAGE_AODH_LISTENER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-listener:current-podified -export RELATED_IMAGE_OVN_NB_DBCLUSTER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-nb-db-server:current-podified -export RELATED_IMAGE_OVN_SB_DBCLUSTER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-sb-db-server:current-podified -export RELATED_IMAGE_OVN_NORTHD_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-northd:current-podified -export RELATED_IMAGE_OVN_CONTROLLER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified -export RELATED_IMAGE_OVN_CONTROLLER_OVS_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-base:current-podified -export RELATED_IMAGE_CINDER_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cinder-api:current-podified -export RELATED_IMAGE_CINDER_BACKUP_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cinder-backup:current-podified -export RELATED_IMAGE_CINDER_SCHEDULER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cinder-scheduler:current-podified -export RELATED_IMAGE_CINDER_VOLUME_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cinder-volume:current-podified -export RELATED_IMAGE_HORIZON_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-horizon:current-podified -export RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-heat-api:current-podified -export RELATED_IMAGE_HEAT_CFNAPI_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-heat-api-cfn:current-podified -export RELATED_IMAGE_HEAT_ENGINE_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-heat-engine:current-podified -export RELATED_IMAGE_SWIFT_PROXY_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-swift-proxy-server:current-podified -export RELATED_IMAGE_SWIFT_ACCOUNT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-swift-account:current-podified -export RELATED_IMAGE_SWIFT_CONTAINER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-swift-container:current-podified -export RELATED_IMAGE_SWIFT_OBJECT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-swift-object:current-podified -export RELATED_IMAGE_NET_UTILS_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-netutils:current-podified -export RELATED_IMAGE_OCTAVIA_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-octavia-api:current-podified -export RELATED_IMAGE_OCTAVIA_HOUSEKEEPING_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-octavia-housekeeping:current-podified -export RELATED_IMAGE_OCTAVIA_HEALTHMANAGER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-octavia-health-manager:current-podified -export RELATED_IMAGE_OCTAVIA_WORKER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-octavia-worker:current-podified -export RELATED_IMAGE_OCTAVIA_RSYSLOG_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-rsyslog:current-podified -export RELATED_IMAGE_DESIGNATE_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-designate-api:current-podified -export RELATED_IMAGE_DESIGNATE_CENTRAL_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-designate-central:current-podified -export RELATED_IMAGE_DESIGNATE_MDNS_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-designate-mdns:current-podified -export RELATED_IMAGE_DESIGNATE_PRODUCER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-designate-producer:current-podified -export RELATED_IMAGE_DESIGNATE_WORKER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-designate-worker:current-podified -export RELATED_IMAGE_DESIGNATE_BACKENDBIND9_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-designate-backend-bind9:current-podified -export RELATED_IMAGE_DESIGNATE_UNBOUND_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-unbound:current-podified -export RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-api:current-podified -export RELATED_IMAGE_BARBICAN_WORKER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-worker:current-podified -export RELATED_IMAGE_BARBICAN_KEYSTONE_LISTENER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-keystone-listener:current-podified -export RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-frr:current-podified -export RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified -export RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified -export RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified -export RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified +export RELATED_IMAGE_CLOUDKITTY_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-cloudkitty-api:master-latest +export RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-aodh-api:master-latest +export RELATED_IMAGE_OVN_NB_DBCLUSTER_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ovn-nb-db-server:master-latest +export RELATED_IMAGE_OVN_SB_DBCLUSTER_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ovn-sb-db-server:master-latest +export RELATED_IMAGE_OVN_NORTHD_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ovn-northd:master-latest +export RELATED_IMAGE_OVN_CONTROLLER_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ovn-controller:master-latest +export RELATED_IMAGE_OVN_CONTROLLER_OVS_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ovn-base:master-latest +export RELATED_IMAGE_CINDER_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-cinder-api:master-latest +export RELATED_IMAGE_CINDER_BACKUP_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-cinder-backup:master-latest +export RELATED_IMAGE_CINDER_SCHEDULER_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-cinder-scheduler:master-latest +export RELATED_IMAGE_CINDER_VOLUME_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-cinder-volume:master-latest +export RELATED_IMAGE_HORIZON_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-horizon:master-latest +export RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-heat-api:master-latest +export RELATED_IMAGE_HEAT_ENGINE_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-heat-engine:master-latest +export RELATED_IMAGE_SWIFT_PROXY_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-swift-proxy-server:master-latest +export RELATED_IMAGE_SWIFT_ACCOUNT_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-swift-account:master-latest +export RELATED_IMAGE_SWIFT_CONTAINER_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-swift-container:master-latest +export RELATED_IMAGE_SWIFT_OBJECT_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-swift-object:master-latest +export RELATED_IMAGE_NET_UTILS_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-netutils:master-latest +export RELATED_IMAGE_OCTAVIA_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-octavia-api:master-latest +export RELATED_IMAGE_OCTAVIA_WORKER_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-octavia-worker:master-latest +export RELATED_IMAGE_OCTAVIA_RSYSLOG_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-rsyslog:master-latest +export RELATED_IMAGE_DESIGNATE_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-designate-api:master-latest +export RELATED_IMAGE_DESIGNATE_CENTRAL_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-designate-central:master-latest +export RELATED_IMAGE_DESIGNATE_WORKER_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-designate-worker:master-latest +export RELATED_IMAGE_DESIGNATE_BACKENDBIND9_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-designate-backend-bind9:master-latest +export RELATED_IMAGE_DESIGNATE_UNBOUND_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-unbound:master-latest +export RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-barbican-api:master-latest +export RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-frr:master-latest +export RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-neutron-dhcp-agent:master-latest +export RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-neutron-metadata-agent-ovn:master-latest +export RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-neutron-ovn-agent:master-latest +export RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-neutron-sriov-agent:master-latest export RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified export RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/node-exporter:v1.5.0 export RELATED_IMAGE_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified export RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT=quay.io/sustainable_computing_io/kepler:release-0.7.12 export RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest -export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified -export RELATED_IMAGE_WATCHER_API_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-api:current-podified -export RELATED_IMAGE_WATCHER_APPLIER_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-applier:current-podified -export RELATED_IMAGE_WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified +export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-tempest:master-latest +export RELATED_IMAGE_WATCHER_BASE_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-watcher-base:master-latest #NOTE: TEST_ images below do not get released downstream. They should not be prefixed with RELATED -export TEST_TOBIKO_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tobiko:current-podified -export TEST_ANSIBLETEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified -export TEST_HORIZONTEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-horizontest:current-podified +export TEST_TOBIKO_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-tobiko:master-latest +export TEST_ANSIBLETEST_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ansible-test:master-latest +export TEST_HORIZONTEST_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-horizontest:master-latest export RELATED_IMAGE_OPENSTACK_MUST_GATHER_DEFAULT=quay.io/openstack-k8s-operators/openstack-must-gather:latest diff --git a/internal/openstack/version.go b/internal/openstack/version.go index 125da0fb4..5f7affcab 100644 --- a/internal/openstack/version.go +++ b/internal/openstack/version.go @@ -67,6 +67,47 @@ func InitializeOpenStackVersionImageDefaults(ctx context.Context, envImages map[ if envImages["RELATED_IMAGE_NEUTRON_API_IMAGE_URL_DEFAULT"] != nil { defaults.InfraDnsmasqImage = envImages["RELATED_IMAGE_NEUTRON_API_IMAGE_URL_DEFAULT"] } + // the following services share a single container image across multiple roles; + // reusing one RELATED_IMAGE per group avoids "Found conflicts when setting + // relatedImages" errors from operator-sdk generate bundle --use-image-digests + if envImages["RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT"] != nil { + defaults.AodhEvaluatorImage = envImages["RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT"] + defaults.AodhListenerImage = envImages["RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT"] + defaults.AodhNotifierImage = envImages["RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT"] + } + if envImages["RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT"] != nil { + defaults.BarbicanKeystoneListenerImage = envImages["RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT"] + defaults.BarbicanWorkerImage = envImages["RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT"] + } + if envImages["RELATED_IMAGE_CEILOMETER_CENTRAL_IMAGE_URL_DEFAULT"] != nil { + defaults.CeilometerNotificationImage = envImages["RELATED_IMAGE_CEILOMETER_CENTRAL_IMAGE_URL_DEFAULT"] + } + if envImages["RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT"] != nil { + defaults.CeilometerIpmiImage = envImages["RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT"] + } + if envImages["RELATED_IMAGE_CLOUDKITTY_API_IMAGE_URL_DEFAULT"] != nil { + defaults.CloudKittyProcImage = envImages["RELATED_IMAGE_CLOUDKITTY_API_IMAGE_URL_DEFAULT"] + } + if envImages["RELATED_IMAGE_DESIGNATE_CENTRAL_IMAGE_URL_DEFAULT"] != nil { + defaults.DesignateMdnsImage = envImages["RELATED_IMAGE_DESIGNATE_CENTRAL_IMAGE_URL_DEFAULT"] + defaults.DesignateProducerImage = envImages["RELATED_IMAGE_DESIGNATE_CENTRAL_IMAGE_URL_DEFAULT"] + } + if envImages["RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFAULT"] != nil { + defaults.HeatCfnapiImage = envImages["RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFAULT"] + } + if envImages["RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT"] != nil { + defaults.IronicPxeImage = envImages["RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT"] + } + if envImages["RELATED_IMAGE_OCTAVIA_WORKER_IMAGE_URL_DEFAULT"] != nil { + defaults.OctaviaHealthmanagerImage = envImages["RELATED_IMAGE_OCTAVIA_WORKER_IMAGE_URL_DEFAULT"] + defaults.OctaviaHousekeepingImage = envImages["RELATED_IMAGE_OCTAVIA_WORKER_IMAGE_URL_DEFAULT"] + } + // s2i base image: a single watcher base image populates all three service images + if envImages["RELATED_IMAGE_WATCHER_BASE_IMAGE_URL_DEFAULT"] != nil { + defaults.WatcherAPIImage = envImages["RELATED_IMAGE_WATCHER_BASE_IMAGE_URL_DEFAULT"] + defaults.WatcherApplierImage = envImages["RELATED_IMAGE_WATCHER_BASE_IMAGE_URL_DEFAULT"] + defaults.WatcherDecisionEngineImage = envImages["RELATED_IMAGE_WATCHER_BASE_IMAGE_URL_DEFAULT"] + } // custom TEST_ images which aren't released downstream if envImages["TEST_TOBIKO_IMAGE_URL_DEFAULT"] != nil { defaults.TestTobikoImage = envImages["TEST_TOBIKO_IMAGE_URL_DEFAULT"] @@ -253,7 +294,7 @@ func InitializeOpenStackVersionServiceDefaults(ctx context.Context) *corev1beta1 // "10.11" in the same change that moves // RELATED_IMAGE_MARIADB_IMAGE_URL_DEFAULT to a 10.11 image. - defaults.IronicInspectInterface = ptr.To("inspector") // TODO: Override to agent for RHOSO 19+ in OpenStackVersion + defaults.IronicInspectInterface = ptr.To("agent") return defaults } diff --git a/test/functional/ctlplane/openstackoperator_controller_test.go b/test/functional/ctlplane/openstackoperator_controller_test.go index 50db1ea8b..281a5d0ca 100644 --- a/test/functional/ctlplane/openstackoperator_controller_test.go +++ b/test/functional/ctlplane/openstackoperator_controller_test.go @@ -2147,7 +2147,7 @@ var _ = Describe("OpenStackOperator controller", func() { Expect(watcher.Spec.APIContainerImageURL).Should(Not(BeNil())) Expect(watcher.Spec.ApplierContainerImageURL).Should(Not(BeNil())) Expect(watcher.Spec.DecisionEngineContainerImageURL).Should(Not(BeNil())) - Expect(watcher.Spec.DecisionEngineContainerImageURL).Should(Equal("quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified")) + Expect(watcher.Spec.DecisionEngineContainerImageURL).Should(Equal("quay.io/openstack-s2i-containers/openstack-watcher-base:master-latest")) Expect(watcher.Spec.APIServiceTemplate.TLS.Ca.CaBundleSecretName).Should(Equal("combined-ca-bundle")) @@ -2254,9 +2254,9 @@ var _ = Describe("OpenStackOperator controller", func() { }, timeout, interval).Should(Succeed()) OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName) - Expect(OSCtlplane.Status.ContainerImages.WatcherAPIImage).Should(Equal(ptr.To("quay.io/podified-master-centos9/openstack-watcher-api:current-podified"))) - Expect(OSCtlplane.Status.ContainerImages.WatcherApplierImage).Should(Equal(ptr.To("quay.io/podified-master-centos9/openstack-watcher-applier:current-podified"))) - Expect(OSCtlplane.Status.ContainerImages.WatcherDecisionEngineImage).Should(Equal(ptr.To("quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified"))) + Expect(OSCtlplane.Status.ContainerImages.WatcherAPIImage).Should(Equal(ptr.To("quay.io/openstack-s2i-containers/openstack-watcher-base:master-latest"))) + Expect(OSCtlplane.Status.ContainerImages.WatcherApplierImage).Should(Equal(ptr.To("quay.io/openstack-s2i-containers/openstack-watcher-base:master-latest"))) + Expect(OSCtlplane.Status.ContainerImages.WatcherDecisionEngineImage).Should(Equal(ptr.To("quay.io/openstack-s2i-containers/openstack-watcher-base:master-latest"))) }) }) @@ -2333,7 +2333,7 @@ var _ = Describe("OpenStackOperator controller", func() { // default Watche container images are set Expect(watcher.Spec.APIContainerImageURL).Should(Not(BeNil())) Expect(watcher.Spec.ApplierContainerImageURL).Should(Not(BeNil())) - Expect(watcher.Spec.DecisionEngineContainerImageURL).Should(Equal("quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified")) + Expect(watcher.Spec.DecisionEngineContainerImageURL).Should(Equal("quay.io/openstack-s2i-containers/openstack-watcher-base:master-latest")) }) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 1e42f8c50..fab556fc1 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -63,6 +63,7 @@ # NOTE(gibi): there are no cinder backend enabled so test needing a # volumes needs to be skipped tempest.scenario.test_minimum_basic.TestMinimumBasicScenario + test_volume_upload_image_hash_verification test_shelve_volume_backed_instance tempest.scenario.test_stamp_pattern.TestStampPattern tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern @@ -80,6 +81,20 @@ cpu_mode = custom cpu_models = Nehalem +# Temporary job to validate antelope images until +# update job is ready +- job: + name: podified-multinode-edpm-deployment-crc-antelope + parent: podified-multinode-edpm-deployment-crc + vars: + cifmw_update_containers_openstack: true + cifmw_update_containers_watcher: true + cifmw_set_containers_registry: quay.io + cifmw_set_containers_org: podified-antelope-centos9 + cifmw_set_containers_tag: current-podified + cifmw_test_operator_tempest_image: quay.io/podified-antelope-centos9/openstack-tempest-all + cifmw_test_operator_tempest_image_tag: current-podified + - job: name: openstack-operator-edpm-baremetal-minor-update parent: cifmw-crc-podified-edpm-baremetal-minor-update diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index dfd7d8b9d..258a045f0 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -5,6 +5,11 @@ jobs: - openstack-k8s-operators-content-provider - podified-multinode-edpm-deployment-crc: + vars: &vars + cifmw_update_containers_openstack: false + cifmw_update_containers_watcher: false + cifmw_test_operator_tempest_image: quay.io/openstack-s2i-containers/openstack-tempest + cifmw_test_operator_tempest_image_tag: master-latest dependencies: ["openstack-k8s-operators-content-provider"] irrelevant-files: &irrelevant-files - .*/*.md @@ -16,16 +21,30 @@ - ^PROJECT$ - ^README.md$ - tests?\/functional + # Temporary job until update job is ready + - podified-multinode-edpm-deployment-crc-antelope: + dependencies: ["openstack-k8s-operators-content-provider"] + irrelevant-files: *irrelevant-files - cifmw-crc-podified-edpm-baremetal: + vars: *vars dependencies: ["openstack-k8s-operators-content-provider"] irrelevant-files: *irrelevant-files + # TODO Make it voting once the job is fixed, current issue is with + # nova nova.exception.TooOldComputeService: - adoption-standalone-to-crc-ceph-provider: + vars: *vars dependencies: ["openstack-k8s-operators-content-provider"] irrelevant-files: *irrelevant-files - - openstack-operator-tempest-multinode + voting: false + - openstack-operator-tempest-multinode: + vars: *vars - openstack-operator-docs-preview - openstack-operator-kuttl: voting: false + # TODO Make it voting once the job is fixed, current issue is with + # keystone-db-sync - openstack-operator-edpm-baremetal-minor-update: + vars: *vars dependencies: ["openstack-k8s-operators-content-provider"] irrelevant-files: *irrelevant-files + voting: false