Skip to content

Commit c016d45

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 <[email protected]>
1 parent b102a94 commit c016d45

11 files changed

+30
-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),

‎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 {

‎pkg/openstack/version.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
9393
BarbicanAPIImage: getImg(instance.Spec.CustomContainerImages.BarbicanAPIImage, defaults.BarbicanAPIImage),
9494
BarbicanKeystoneListenerImage: getImg(instance.Spec.CustomContainerImages.BarbicanKeystoneListenerImage, defaults.BarbicanKeystoneListenerImage),
9595
BarbicanWorkerImage: getImg(instance.Spec.CustomContainerImages.BarbicanWorkerImage, defaults.BarbicanWorkerImage),
96+
BootcOsContainerImage: getImg(instance.Spec.CustomContainerImages.BootcOsContainerImage, defaults.BootcOsContainerImage),
9697
CeilometerCentralImage: getImg(instance.Spec.CustomContainerImages.CeilometerCentralImage, defaults.CeilometerCentralImage),
9798
CeilometerComputeImage: getImg(instance.Spec.CustomContainerImages.CeilometerComputeImage, defaults.CeilometerComputeImage),
9899
CeilometerIpmiImage: getImg(instance.Spec.CustomContainerImages.CeilometerIpmiImage, defaults.CeilometerIpmiImage),

0 commit comments

Comments
 (0)