Skip to content

[18-stable] Use rdo images with consistent tag when not using content-provider #1097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Oct 21, 2026
Merged

[18-stable] Use rdo images with consistent tag when not using content-provider #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/v1beta1/cloudkitty_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ const (
CloudKittyGroupID = 42408

// CloudKittyAPIContainerImage - default fall-back image for CloudKitty API
CloudKittyAPIContainerImage = "quay.io/podified-master-centos9/openstack-cloudkitty-api:current-podified"
CloudKittyAPIContainerImage = "quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-api:consistent"
// CloudKittyProcContainerImage - default fall-back image for CloudKitty Processor
CloudKittyProcContainerImage = "quay.io/podified-master-centos9/openstack-cloudkitty-processor:current-podified"
CloudKittyProcContainerImage = "quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-processor:consistent"
// CloudKittyDbSyncHash hash
CKDbSyncHash = "ckdbsync"
// CKStorageInitHash hash
Expand Down
8 changes: 4 additions & 4 deletions ci/files/master-aodh-patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
spec:
customContainerImages:
aodhAPIImage: quay.io/podified-master-centos9/openstack-aodh-api:current-podified
aodhEvaluatorImage: quay.io/podified-master-centos9/openstack-aodh-evaluator:current-podified
aodhListenerImage: quay.io/podified-master-centos9/openstack-aodh-listener:current-podified
aodhNotifierImage: quay.io/podified-master-centos9/openstack-aodh-notifier:current-podified
aodhAPIImage: quay.rdoproject.org/podified-master-centos10/openstack-aodh-api:consistent
aodhEvaluatorImage: quay.rdoproject.org/podified-master-centos10/openstack-aodh-evaluator:consistent
aodhListenerImage: quay.rdoproject.org/podified-master-centos10/openstack-aodh-listener:consistent
aodhNotifierImage: quay.rdoproject.org/podified-master-centos10/openstack-aodh-notifier:consistent
4 changes: 2 additions & 2 deletions ci/files/master-ceilometer-patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
spec:
customContainerImages:
ceilometerCentralImage: quay.io/podified-master-centos9/openstack-ceilometer-central:current-podified
ceilometerComputeImage: quay.io/podified-master-centos9/openstack-ceilometer-compute:current-podified
ceilometerCentralImage: quay.rdoproject.org/podified-master-centos10/openstack-ceilometer-central:consistent
ceilometerComputeImage: quay.rdoproject.org/podified-master-centos10/openstack-ceilometer-compute:consistent
4 changes: 2 additions & 2 deletions ci/files/master-cloudkitty-patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
spec:
customContainerImages:
cloudkittyAPIImage: quay.io/podified-master-centos9/openstack-cloudkitty-api:current-podified
cloudkittyProcImage: quay.io/podified-master-centos9/openstack-cloudkitty-processor:current-podified
cloudkittyAPIImage: quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-api:consistent
cloudkittyProcImage: quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-processor:consistent
6 changes: 3 additions & 3 deletions ci/files/master-heat-patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
spec:
customContainerImages:
heatAPIImage: quay.io/podified-master-centos9/openstack-heat-api:current-podified
heatCfnapiImage: quay.io/podified-master-centos9/openstack-heat-api-cfn:current-podified
heatEngineImage: quay.io/podified-master-centos9/openstack-heat-engine:current-podified
heatAPIImage: quay.rdoproject.org/podified-master-centos10/openstack-heat-api:consistent
heatCfnapiImage: quay.rdoproject.org/podified-master-centos10/openstack-heat-api-cfn:consistent
heatEngineImage: quay.rdoproject.org/podified-master-centos10/openstack-heat-engine:consistent
2 changes: 1 addition & 1 deletion ci/files/master-openstackclient-patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
spec:
customContainerImages:
openstackClientImage: quay.io/podified-master-centos9/openstack-openstackclient:current-podified
openstackClientImage: quay.rdoproject.org/podified-master-centos10/openstack-openstackclient:consistent
4 changes: 2 additions & 2 deletions ci/use-meta-content-telemetry-containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != '' -%}
{{ content_provider_os_registry_url }}
{%- else -%}
quay.io/podified-master-centos9
quay.rdoproject.org/podified-master-centos10
{%- endif -%}
telemetry_tag: >-
{%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != '' -%}
telemetry_latest
{%- else -%}
current-podified
consistent
{%- endif -%}
tasks:
- name: Ensure patch output directory exists
Expand Down
Loading