Skip to content

Commit 4fc43f3

Browse files
bshepharbshephar
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 f6b41da commit 4fc43f3

12 files changed

+32
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17971,6 +17971,8 @@ spec:
1797117971
type: string
1797217972
barbicanWorkerImage:
1797317973
type: string
17974+
bootcOsContainerImage:
17975+
type: string
1797417976
ceilometerCentralImage:
1797517977
type: string
1797617978
ceilometerComputeImage:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ spec:
6161
type: string
6262
barbicanWorkerImage:
6363
type: string
64+
bootcOsContainerImage:
65+
type: string
6466
ceilometerCentralImage:
6567
type: string
6668
ceilometerComputeImage:
@@ -280,6 +282,8 @@ spec:
280282
type: string
281283
barbicanWorkerImage:
282284
type: string
285+
bootcOsContainerImage:
286+
type: string
283287
ceilometerCentralImage:
284288
type: string
285289
ceilometerComputeImage:
@@ -464,6 +468,8 @@ spec:
464468
type: string
465469
barbicanWorkerImage:
466470
type: string
471+
bootcOsContainerImage:
472+
type: string
467473
ceilometerCentralImage:
468474
type: string
469475
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
@@ -219,6 +219,7 @@ var ContainerImageDefaults = openstackv1.ContainerImages{
219219
AgentImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified"),
220220
AnsibleeeImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"),
221221
ApacheImage: getStrPtr("registry.redhat.io/ubi9/httpd-24:latest"),
222+
BootcOsContainerImage: getStrPtr("quay.io/openstack-k8s-operators/edpm-bootc:current-podified"),
222223
EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"),
223224
EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"),
224225
EdpmLogrotateCrondImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-cron:current-podified"),
@@ -251,6 +252,7 @@ func SetupDefaults() {
251252
AgentImage: getImageDefault("RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.AgentImage),
252253
AnsibleeeImage: getImageDefault("RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT", ContainerImageDefaults.AnsibleeeImage),
253254
ApacheImage: getImageDefault("RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT", ContainerImageDefaults.ApacheImage),
255+
BootcOsContainerImage: getImageDefault("RELATED_IMAGE_BOOTC_OS_CONTAINER_IMAGE_URL_DEFAUILT", ContainerImageDefaults.BootcOsContainerImage),
254256
EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage),
255257
EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage),
256258
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
@@ -17971,6 +17971,8 @@ spec:
1797117971
type: string
1797217972
barbicanWorkerImage:
1797317973
type: string
17974+
bootcOsContainerImage:
17975+
type: string
1797417976
ceilometerCentralImage:
1797517977
type: string
1797617978
ceilometerComputeImage:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ spec:
6161
type: string
6262
barbicanWorkerImage:
6363
type: string
64+
bootcOsContainerImage:
65+
type: string
6466
ceilometerCentralImage:
6567
type: string
6668
ceilometerComputeImage:
@@ -280,6 +282,8 @@ spec:
280282
type: string
281283
barbicanWorkerImage:
282284
type: string
285+
bootcOsContainerImage:
286+
type: string
283287
ceilometerCentralImage:
284288
type: string
285289
ceilometerComputeImage:
@@ -464,6 +468,8 @@ spec:
464468
type: string
465469
barbicanWorkerImage:
466470
type: string
471+
bootcOsContainerImage:
472+
type: string
467473
ceilometerCentralImage:
468474
type: string
469475
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
@@ -351,6 +351,9 @@ func resolveGroupAnsibleVars(template *dataplanev1.NodeTemplate, group *ansible.
351351
if template.Ansible.AnsibleVars["edpm_telemetry_openstack_network_exporter_image"] == nil {
352352
group.Vars["edpm_telemetry_openstack_network_exporter_image"] = containerImages.EdpmOpenstackNetworkExporterImage
353353
}
354+
if template.Ansible.AnsibleVars["edpm_bootc_os_container_image"] == nil {
355+
group.Vars["edpm_bootc_os_container_image"] = containerImages.BootcOsContainerImage
356+
}
354357

355358
err := unmarshalAnsibleVars(template.Ansible.AnsibleVars, group.Vars)
356359
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)