Skip to content

Commit c751d7d

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 467c641 commit c751d7d

12 files changed

+38
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17464,6 +17464,8 @@ spec:
1746417464
type: string
1746517465
barbicanWorkerImage:
1746617466
type: string
17467+
bootcOsContainerImage:
17468+
type: string
1746717469
ceilometerCentralImage:
1746817470
type: string
1746917471
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:
@@ -277,6 +279,8 @@ spec:
277279
type: string
278280
barbicanWorkerImage:
279281
type: string
282+
bootcOsContainerImage:
283+
type: string
280284
ceilometerCentralImage:
281285
type: string
282286
ceilometerComputeImage:
@@ -461,6 +465,8 @@ spec:
461465
type: string
462466
barbicanWorkerImage:
463467
type: string
468+
bootcOsContainerImage:
469+
type: string
464470
ceilometerCentralImage:
465471
type: string
466472
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),

‎bindata/crds/crds.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17628,6 +17628,8 @@ spec:
1762817628
type: string
1762917629
barbicanWorkerImage:
1763017630
type: string
17631+
bootcOsContainerImage:
17632+
type: string
1763117633
ceilometerCentralImage:
1763217634
type: string
1763317635
ceilometerComputeImage:
@@ -19205,6 +19207,8 @@ spec:
1920519207
type: string
1920619208
barbicanWorkerImage:
1920719209
type: string
19210+
bootcOsContainerImage:
19211+
type: string
1920819212
ceilometerCentralImage:
1920919213
type: string
1921019214
ceilometerComputeImage:
@@ -19424,6 +19428,8 @@ spec:
1942419428
type: string
1942519429
barbicanWorkerImage:
1942619430
type: string
19431+
bootcOsContainerImage:
19432+
type: string
1942719433
ceilometerCentralImage:
1942819434
type: string
1942919435
ceilometerComputeImage:
@@ -19608,6 +19614,8 @@ spec:
1960819614
type: string
1960919615
barbicanWorkerImage:
1961019616
type: string
19617+
bootcOsContainerImage:
19618+
type: string
1961119619
ceilometerCentralImage:
1961219620
type: string
1961319621
ceilometerComputeImage:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17464,6 +17464,8 @@ spec:
1746417464
type: string
1746517465
barbicanWorkerImage:
1746617466
type: string
17467+
bootcOsContainerImage:
17468+
type: string
1746717469
ceilometerCentralImage:
1746817470
type: string
1746917471
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:
@@ -277,6 +279,8 @@ spec:
277279
type: string
278280
barbicanWorkerImage:
279281
type: string
282+
bootcOsContainerImage:
283+
type: string
280284
ceilometerCentralImage:
281285
type: string
282286
ceilometerComputeImage:
@@ -461,6 +465,8 @@ spec:
461465
type: string
462466
barbicanWorkerImage:
463467
type: string
468+
bootcOsContainerImage:
469+
type: string
464470
ceilometerCentralImage:
465471
type: string
466472
ceilometerComputeImage:

‎hack/export_related_images.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ export RELATED_IMAGE_DESIGNATE_UNBOUND_IMAGE_URL_DEFAULT=quay.io/podified-antelo
7373
export RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-api:current-podified
7474
export RELATED_IMAGE_BARBICAN_WORKER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-worker:current-podified
7575
export RELATED_IMAGE_BARBICAN_KEYSTONE_LISTENER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-keystone-listener:current-podified
76+
export RELATED_IMAGE_BOOTC_OS_CONTAINER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/edpm-bootc:current-podified
7677
export RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-frr:current-podified
7778
export RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-iscsid:current-podified
7879
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 {

0 commit comments

Comments
 (0)