Skip to content

Switch to S2I master Images by default #2070

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 2 commits into from
Sep 29, 2026
Merged

Switch to S2I master Images by default #2070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23fd8fd
Switch to S2I master Images by default
karelyatin Sep 9, 2026
c42bc51
[openstackclient] Explicitly set identity_api_version
karelyatin Sep 29, 2026
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
2 changes: 1 addition & 1 deletion api/client/v1beta1/openstackclient_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions api/dataplane/v1beta1/openstackdataplanenodeset_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,32 +227,32 @@ var ContainerImageDefaults = openstackv1.ContainerImages{
AgentImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified"),
AnsibleeeImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"),
ApacheImage: getStrPtr("registry.redhat.io/ubi10/httpd-24:latest"),
EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"),
EdpmFrrImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-frr:master-latest"),
// Deprecated: EdpmIscsidImage is no longer used. iscsid now runs on the host instead of in a container.
EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"),
// Deprecated: EdpmLogrotateCrondImage is no longer used. logrotate-crond has been removed.
EdpmLogrotateCrondImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-cron:current-podified"),
EdpmNeutronDhcpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified"),
EdpmNeutronMetadataAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified"),
EdpmNeutronOvnAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified"),
EdpmNeutronSriovAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"),
EdpmNeutronDhcpAgentImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-neutron-dhcp-agent:master-latest"),
EdpmNeutronMetadataAgentImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-neutron-metadata-agent-ovn:master-latest"),
EdpmNeutronOvnAgentImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-neutron-ovn-agent:master-latest"),
EdpmNeutronSriovAgentImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-neutron-sriov-agent:master-latest"),
// Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container.
EdpmMultipathdImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-multipathd:current-podified"),
NovaComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"),
OvnControllerImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified"),
NovaComputeImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-nova-compute:master-latest"),
OvnControllerImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-ovn-controller:master-latest"),
EdpmOvnBgpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified"),
CeilometerComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-compute:current-podified"),
CeilometerIpmiImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-ipmi:current-podified"),
CeilometerComputeImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-ceilometer-compute:master-latest"),
CeilometerIpmiImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-ceilometer-compute:master-latest"),
EdpmNodeExporterImage: getStrPtr("quay.io/prometheus/node-exporter:v1.5.0"),
// Deprecated: EdpmKeplerImage is no longer used. Kepler has been removed from the telemetry stack.
EdpmKeplerImage: getStrPtr("quay.io/sustainable_computing_io/kepler:release-0.7.12"),
EdpmPodmanExporterImage: getStrPtr("quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest"),
OpenstackNetworkExporterImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified"),
OsContainerImage: getStrPtr("quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified"),
SwiftAccountImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-swift-account:current-podified"),
SwiftContainerImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-swift-container:current-podified"),
SwiftObjectImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-swift-object:current-podified"),
SwiftProxyImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-swift-proxy-server:current-podified"),
SwiftAccountImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-swift-account:master-latest"),
SwiftContainerImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-swift-container:master-latest"),
SwiftObjectImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-swift-object:master-latest"),
SwiftProxyImage: getStrPtr("quay.io/openstack-s2i-containers/openstack-swift-proxy-server:master-latest"),
}}

// ContainerImages - the values if no OpenStackVersion is used
Expand Down Expand Up @@ -285,9 +285,9 @@ func SetupDefaults() {
OpenstackNetworkExporterImage: getImageDefault("RELATED_IMAGE_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.OpenstackNetworkExporterImage),
EdpmOvnBgpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmOvnBgpAgentImage),
CeilometerComputeImage: getImageDefault("RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerComputeImage),
CeilometerIpmiImage: getImageDefault("RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerIpmiImage),
CeilometerIpmiImage: getImageDefault("RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerIpmiImage),
NovaComputeImage: getImageDefault("RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.NovaComputeImage),
OvnControllerImage: getImageDefault("RELATED_IMAGE_OVN_CONTROLLER_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.OvnControllerImage),
OvnControllerImage: getImageDefault("RELATED_IMAGE_OVN_CONTROLLER_IMAGE_URL_DEFAULT", ContainerImageDefaults.OvnControllerImage),
OsContainerImage: getImageDefault("RELATED_IMAGE_OS_CONTAINER_IMAGE_URL_DEFAULT", ContainerImageDefaults.OsContainerImage),
SwiftAccountImage: getImageDefault("RELATED_IMAGE_SWIFT_ACCOUNT_IMAGE_URL_DEFAULT", ContainerImageDefaults.SwiftAccountImage),
SwiftContainerImage: getImageDefault("RELATED_IMAGE_SWIFT_CONTAINER_IMAGE_URL_DEFAULT", ContainerImageDefaults.SwiftContainerImage),
Expand Down
Loading
Loading