Skip to content

Commit c02dfa9

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 95ba48c commit c02dfa9

12 files changed

Lines changed: 38 additions & 0 deletions

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17400,6 +17400,8 @@ spec:
1740017400
type: string
1740117401
barbicanWorkerImage:
1740217402
type: string
17403+
bootcOsContainerImage:
17404+
type: string
1740317405
ceilometerCentralImage:
1740417406
type: string
1740517407
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:
@@ -273,6 +275,8 @@ spec:
273275
type: string
274276
barbicanWorkerImage:
275277
type: string
278+
bootcOsContainerImage:
279+
type: string
276280
ceilometerCentralImage:
277281
type: string
278282
ceilometerComputeImage:
@@ -453,6 +457,8 @@ spec:
453457
type: string
454458
barbicanWorkerImage:
455459
type: string
460+
bootcOsContainerImage:
461+
type: string
456462
ceilometerCentralImage:
457463
type: string
458464
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"),
@@ -246,6 +247,7 @@ func SetupDefaults() {
246247
AgentImage: getImageDefault("RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.AgentImage),
247248
AnsibleeeImage: getImageDefault("RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT", ContainerImageDefaults.AnsibleeeImage),
248249
ApacheImage: getImageDefault("RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT", ContainerImageDefaults.ApacheImage),
250+
BootcOsContainerImage: getImageDefault("RELATED_IMAGE_BOOTC_OS_CONTAINER_IMAGE_URL_DEFAUILT", ContainerImageDefaults.BootcOsContainerImage),
249251
EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage),
250252
EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage),
251253
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
@@ -17564,6 +17564,8 @@ spec:
1756417564
type: string
1756517565
barbicanWorkerImage:
1756617566
type: string
17567+
bootcOsContainerImage:
17568+
type: string
1756717569
ceilometerCentralImage:
1756817570
type: string
1756917571
ceilometerComputeImage:
@@ -19137,6 +19139,8 @@ spec:
1913719139
type: string
1913819140
barbicanWorkerImage:
1913919141
type: string
19142+
bootcOsContainerImage:
19143+
type: string
1914019144
ceilometerCentralImage:
1914119145
type: string
1914219146
ceilometerComputeImage:
@@ -19352,6 +19356,8 @@ spec:
1935219356
type: string
1935319357
barbicanWorkerImage:
1935419358
type: string
19359+
bootcOsContainerImage:
19360+
type: string
1935519361
ceilometerCentralImage:
1935619362
type: string
1935719363
ceilometerComputeImage:
@@ -19532,6 +19538,8 @@ spec:
1953219538
type: string
1953319539
barbicanWorkerImage:
1953419540
type: string
19541+
bootcOsContainerImage:
19542+
type: string
1953519543
ceilometerCentralImage:
1953619544
type: string
1953719545
ceilometerComputeImage:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17400,6 +17400,8 @@ spec:
1740017400
type: string
1740117401
barbicanWorkerImage:
1740217402
type: string
17403+
bootcOsContainerImage:
17404+
type: string
1740317405
ceilometerCentralImage:
1740417406
type: string
1740517407
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:
@@ -273,6 +275,8 @@ spec:
273275
type: string
274276
barbicanWorkerImage:
275277
type: string
278+
bootcOsContainerImage:
279+
type: string
276280
ceilometerCentralImage:
277281
type: string
278282
ceilometerComputeImage:
@@ -453,6 +457,8 @@ spec:
453457
type: string
454458
barbicanWorkerImage:
455459
type: string
460+
bootcOsContainerImage:
461+
type: string
456462
ceilometerCentralImage:
457463
type: string
458464
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
@@ -320,6 +320,9 @@ func resolveGroupAnsibleVars(template *dataplanev1.NodeTemplate, group *ansible.
320320
if template.Ansible.AnsibleVars["edpm_telemetry_kepler_image"] == nil {
321321
group.Vars["edpm_telemetry_kepler_image"] = containerImages.EdpmKeplerImage
322322
}
323+
if template.Ansible.AnsibleVars["edpm_bootc_os_container_image"] == nil {
324+
group.Vars["edpm_bootc_os_container_image"] = containerImages.BootcOsContainerImage
325+
}
323326

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

0 commit comments

Comments
 (0)