Skip to content

Commit 702b910

Browse files
author
Brendan Shephard
committed
Add bootc image reference
To support image mode RHEL deployments, this change adds the reference to the bootc container image. Jira: https://issues.redhat.com/browse/OSPRH-14326 Signed-off-by: Brendan Shephard <bshephar@redhat.com>
1 parent 9e76d25 commit 702b910

12 files changed

Lines changed: 32 additions & 0 deletions

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17466,6 +17466,8 @@ spec:
1746617466
type: string
1746717467
barbicanWorkerImage:
1746817468
type: string
17469+
bootcOsContainerImage:
17470+
type: string
1746917471
ceilometerCentralImage:
1747017472
type: string
1747117473
ceilometerComputeImage:

‎apis/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ spec:
5858
type: string
5959
barbicanWorkerImage:
6060
type: string
61+
bootcOsContainerImage:
62+
type: string
6163
ceilometerCentralImage:
6264
type: string
6365
ceilometerComputeImage:
@@ -275,6 +277,8 @@ spec:
275277
type: string
276278
barbicanWorkerImage:
277279
type: string
280+
bootcOsContainerImage:
281+
type: string
278282
ceilometerCentralImage:
279283
type: string
280284
ceilometerComputeImage:
@@ -457,6 +461,8 @@ spec:
457461
type: string
458462
barbicanWorkerImage:
459463
type: string
464+
bootcOsContainerImage:
465+
type: string
460466
ceilometerCentralImage:
461467
type: string
462468
ceilometerComputeImage:

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ type ContainerTemplate struct {
8484
BarbicanAPIImage *string `json:"barbicanAPIImage,omitempty"`
8585
BarbicanKeystoneListenerImage *string `json:"barbicanKeystoneListenerImage,omitempty"`
8686
BarbicanWorkerImage *string `json:"barbicanWorkerImage,omitempty"`
87+
BootcOsContainerImage *string `json:"bootcOsContainerImage,omitempty"`
8788
CeilometerCentralImage *string `json:"ceilometerCentralImage,omitempty"`
8889
CeilometerComputeImage *string `json:"ceilometerComputeImage,omitempty"`
8990
CeilometerIpmiImage *string `json:"ceilometerIpmiImage,omitempty"`

‎apis/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/dataplane/v1beta1/openstackdataplanenodeset_types.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ var ContainerImageDefaults = openstackv1.ContainerImages{
216216
AgentImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified"),
217217
AnsibleeeImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"),
218218
ApacheImage: getStrPtr("registry.redhat.io/ubi9/httpd-24:latest"),
219+
BootcOsContainerImage: getStrPtr("quay.io/openstack-k8s-operators/edpm-bootc:current-podified"),
219220
EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"),
220221
EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"),
221222
EdpmLogrotateCrondImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-cron:current-podified"),
@@ -248,6 +249,7 @@ func SetupDefaults() {
248249
AgentImage: getImageDefault("RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.AgentImage),
249250
AnsibleeeImage: getImageDefault("RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT", ContainerImageDefaults.AnsibleeeImage),
250251
ApacheImage: getImageDefault("RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT", ContainerImageDefaults.ApacheImage),
252+
BootcOsContainerImage: getImageDefault("RELATED_IMAGE_BOOTC_OS_CONTAINER_IMAGE_URL_DEFAUILT", ContainerImageDefaults.BootcOsContainerImage),
251253
EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage),
252254
EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage),
253255
EdpmLogrotateCrondImage: getImageDefault("RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmLogrotateCrondImage),

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17466,6 +17466,8 @@ spec:
1746617466
type: string
1746717467
barbicanWorkerImage:
1746817468
type: string
17469+
bootcOsContainerImage:
17470+
type: string
1746917471
ceilometerCentralImage:
1747017472
type: string
1747117473
ceilometerComputeImage:

‎config/crd/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ spec:
5858
type: string
5959
barbicanWorkerImage:
6060
type: string
61+
bootcOsContainerImage:
62+
type: string
6163
ceilometerCentralImage:
6264
type: string
6365
ceilometerComputeImage:
@@ -275,6 +277,8 @@ spec:
275277
type: string
276278
barbicanWorkerImage:
277279
type: string
280+
bootcOsContainerImage:
281+
type: string
278282
ceilometerCentralImage:
279283
type: string
280284
ceilometerComputeImage:
@@ -457,6 +461,8 @@ spec:
457461
type: string
458462
barbicanWorkerImage:
459463
type: string
464+
bootcOsContainerImage:
465+
type: string
460466
ceilometerCentralImage:
461467
type: string
462468
ceilometerComputeImage:

‎hack/export_related_images.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export RELATED_IMAGE_DESIGNATE_UNBOUND_IMAGE_URL_DEFAULT=quay.io/podified-antelo
7272
export RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-api:current-podified
7373
export RELATED_IMAGE_BARBICAN_WORKER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-worker:current-podified
7474
export RELATED_IMAGE_BARBICAN_KEYSTONE_LISTENER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-keystone-listener:current-podified
75+
export RELATED_IMAGE_BOOTC_OS_CONTAINER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/edpm-bootc:current-podified
7576
export RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-frr:current-podified
7677
export RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-iscsid:current-podified
7778
export RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cron:current-podified

‎pkg/dataplane/inventory.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,9 @@ func resolveGroupAnsibleVars(template *dataplanev1.NodeTemplate, group *ansible.
326326
if template.Ansible.AnsibleVars["edpm_telemetry_openstack_network_exporter_image"] == nil {
327327
group.Vars["edpm_telemetry_openstack_network_exporter_image"] = containerImages.EdpmOpenstackNetworkExporterImage
328328
}
329+
if template.Ansible.AnsibleVars["edpm_bootc_os_container_image"] == nil {
330+
group.Vars["edpm_bootc_os_container_image"] = containerImages.BootcOsContainerImage
331+
}
329332

330333
err := unmarshalAnsibleVars(template.Ansible.AnsibleVars, group.Vars)
331334
if err != nil {

‎pkg/dataplane/util/version.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta
6161
// OpenStackVersion, use the value from there, else use the default value.
6262
if version != nil {
6363
containerImages.AnsibleeeImage = version.Status.ContainerImages.AnsibleeeImage
64+
containerImages.BootcOsContainerImage = version.Status.ContainerImages.BootcOsContainerImage
6465
containerImages.CeilometerComputeImage = version.Status.ContainerImages.CeilometerComputeImage
6566
containerImages.CeilometerIpmiImage = version.Status.ContainerImages.CeilometerIpmiImage
6667
containerImages.EdpmFrrImage = version.Status.ContainerImages.EdpmFrrImage
@@ -83,6 +84,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta
8384
containerImages.ApacheImage = version.Status.ContainerImages.ApacheImage
8485
} else {
8586
containerImages.AnsibleeeImage = dataplanev1.ContainerImages.AnsibleeeImage
87+
containerImages.BootcOsContainerImage = dataplanev1.ContainerImages.BootcOsContainerImage
8688
containerImages.CeilometerComputeImage = dataplanev1.ContainerImages.CeilometerComputeImage
8789
containerImages.CeilometerIpmiImage = dataplanev1.ContainerImages.CeilometerIpmiImage
8890
containerImages.EdpmFrrImage = dataplanev1.ContainerImages.EdpmFrrImage

0 commit comments

Comments
 (0)