Skip to content

Commit 43eaad1

Browse files
stevebsteveb
committed
Add CSV entries for new graphical console image
This image is being built out of current s2i-openstack-containers. This supports feature work in ironic-operator targetted for 19.0.0 GA. Jira: OSPRH-20211
1 parent f3a5bdb commit 43eaad1

12 files changed

Lines changed: 45 additions & 0 deletions

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19471,6 +19471,8 @@ spec:
1947119471
type: string
1947219472
ironicConductorImage:
1947319473
type: string
19474+
ironicGraphicalConsoleImage:
19475+
type: string
1947419476
ironicInspectorImage:
1947519477
type: string
1947619478
ironicNeutronAgentImage:

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ spec:
151151
type: string
152152
ironicConductorImage:
153153
type: string
154+
ironicGraphicalConsoleImage:
155+
type: string
154156
ironicInspectorImage:
155157
type: string
156158
ironicNeutronAgentImage:
@@ -403,6 +405,8 @@ spec:
403405
type: string
404406
ironicConductorImage:
405407
type: string
408+
ironicGraphicalConsoleImage:
409+
type: string
406410
ironicInspectorImage:
407411
type: string
408412
ironicNeutronAgentImage:
@@ -605,6 +609,8 @@ spec:
605609
type: string
606610
ironicConductorImage:
607611
type: string
612+
ironicGraphicalConsoleImage:
613+
type: string
608614
ironicInspectorImage:
609615
type: string
610616
ironicNeutronAgentImage:
@@ -833,6 +839,8 @@ spec:
833839
type: string
834840
ironicConductorImage:
835841
type: string
842+
ironicGraphicalConsoleImage:
843+
type: string
836844
ironicInspectorImage:
837845
type: string
838846
ironicNeutronAgentImage:

‎api/core/v1beta1/openstackversion_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ type ContainerTemplate struct {
254254
InfraRedisImage *string `json:"infraRedisImage,omitempty"`
255255
IronicAPIImage *string `json:"ironicAPIImage,omitempty"`
256256
IronicConductorImage *string `json:"ironicConductorImage,omitempty"`
257+
IronicGraphicalConsoleImage *string `json:"ironicGraphicalConsoleImage,omitempty"`
257258
IronicInspectorImage *string `json:"ironicInspectorImage,omitempty"`
258259
IronicNeutronAgentImage *string `json:"ironicNeutronAgentImage,omitempty"`
259260
IronicPxeImage *string `json:"ironicPxeImage,omitempty"`

‎api/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.

‎bindata/crds/crds.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20500,6 +20500,8 @@ spec:
2050020500
type: string
2050120501
ironicConductorImage:
2050220502
type: string
20503+
ironicGraphicalConsoleImage:
20504+
type: string
2050320505
ironicInspectorImage:
2050420506
type: string
2050520507
ironicNeutronAgentImage:
@@ -23045,6 +23047,8 @@ spec:
2304523047
type: string
2304623048
ironicConductorImage:
2304723049
type: string
23050+
ironicGraphicalConsoleImage:
23051+
type: string
2304823052
ironicInspectorImage:
2304923053
type: string
2305023054
ironicNeutronAgentImage:
@@ -23297,6 +23301,8 @@ spec:
2329723301
type: string
2329823302
ironicConductorImage:
2329923303
type: string
23304+
ironicGraphicalConsoleImage:
23305+
type: string
2330023306
ironicInspectorImage:
2330123307
type: string
2330223308
ironicNeutronAgentImage:
@@ -23499,6 +23505,8 @@ spec:
2349923505
type: string
2350023506
ironicConductorImage:
2350123507
type: string
23508+
ironicGraphicalConsoleImage:
23509+
type: string
2350223510
ironicInspectorImage:
2350323511
type: string
2350423512
ironicNeutronAgentImage:
@@ -23727,6 +23735,8 @@ spec:
2372723735
type: string
2372823736
ironicConductorImage:
2372923737
type: string
23738+
ironicGraphicalConsoleImage:
23739+
type: string
2373023740
ironicInspectorImage:
2373123741
type: string
2373223742
ironicNeutronAgentImage:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19471,6 +19471,8 @@ spec:
1947119471
type: string
1947219472
ironicConductorImage:
1947319473
type: string
19474+
ironicGraphicalConsoleImage:
19475+
type: string
1947419476
ironicInspectorImage:
1947519477
type: string
1947619478
ironicNeutronAgentImage:

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ spec:
151151
type: string
152152
ironicConductorImage:
153153
type: string
154+
ironicGraphicalConsoleImage:
155+
type: string
154156
ironicInspectorImage:
155157
type: string
156158
ironicNeutronAgentImage:
@@ -403,6 +405,8 @@ spec:
403405
type: string
404406
ironicConductorImage:
405407
type: string
408+
ironicGraphicalConsoleImage:
409+
type: string
406410
ironicInspectorImage:
407411
type: string
408412
ironicNeutronAgentImage:
@@ -605,6 +609,8 @@ spec:
605609
type: string
606610
ironicConductorImage:
607611
type: string
612+
ironicGraphicalConsoleImage:
613+
type: string
608614
ironicInspectorImage:
609615
type: string
610616
ironicNeutronAgentImage:
@@ -833,6 +839,8 @@ spec:
833839
type: string
834840
ironicConductorImage:
835841
type: string
842+
ironicGraphicalConsoleImage:
843+
type: string
836844
ironicInspectorImage:
837845
type: string
838846
ironicNeutronAgentImage:

‎config/operator/default_images.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ spec:
8787
value: quay.io/openstack-s2i-containers/openstack-ironic-api:master-latest
8888
- name: RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT
8989
value: quay.io/openstack-s2i-containers/openstack-ironic-conductor:master-latest
90+
- name: RELATED_IMAGE_IRONIC_GRAPHICAL_CONSOLE_IMAGE_URL_DEFAULT
91+
value: quay.io/openstack-s2i-containers/openstack-ironic-graphical-console:master-latest
9092
- name: RELATED_IMAGE_IRONIC_INSPECTOR_IMAGE_URL_DEFAULT
9193
value: quay.io/podified-antelope-centos9/openstack-ironic-inspector:current-podified
9294
- name: RELATED_IMAGE_IRONIC_NEUTRON_AGENT_IMAGE_URL_DEFAULT

‎hack/export_related_images.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export RELATED_IMAGE_MANILA_SHARE_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-contai
2020
export RELATED_IMAGE_GLANCE_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-glance-api:master-latest
2121
export RELATED_IMAGE_IRONIC_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ironic-api:master-latest
2222
export RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ironic-conductor:master-latest
23+
export RELATED_IMAGE_IRONIC_GRAPHICAL_CONSOLE_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ironic-graphical-console:master-latest
2324
export RELATED_IMAGE_IRONIC_INSPECTOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-inspector:current-podified
2425
export RELATED_IMAGE_IRONIC_NEUTRON_AGENT_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ironic-neutron-agent:master-latest
2526
export RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/ironic-python-agent:current-podified

‎internal/openstack/ironic.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
3636
instance.Status.Conditions.Remove(corev1beta1.OpenStackControlPlaneExposeIronicReadyCondition)
3737
instance.Status.ContainerImages.IronicAPIImage = nil
3838
instance.Status.ContainerImages.IronicConductorImage = nil
39+
instance.Status.ContainerImages.IronicGraphicalConsoleImage = nil
3940
instance.Status.ContainerImages.IronicInspectorImage = nil
4041
instance.Status.ContainerImages.IronicNeutronAgentImage = nil
4142
instance.Status.ContainerImages.IronicPxeImage = nil
@@ -271,6 +272,7 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
271272

272273
ironic.Spec.Images.API = *version.Status.ContainerImages.IronicAPIImage
273274
ironic.Spec.Images.Conductor = *version.Status.ContainerImages.IronicConductorImage
275+
ironic.Spec.Images.GraphicalConsole = *version.Status.ContainerImages.IronicGraphicalConsoleImage
274276
ironic.Spec.Images.Inspector = *version.Status.ContainerImages.IronicInspectorImage
275277
ironic.Spec.Images.NeutronAgent = *version.Status.ContainerImages.IronicNeutronAgentImage
276278
ironic.Spec.Images.Pxe = *version.Status.ContainerImages.IronicPxeImage
@@ -315,6 +317,7 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
315317
Log.Info("Ironic ready condition is true")
316318
instance.Status.ContainerImages.IronicAPIImage = version.Status.ContainerImages.IronicAPIImage
317319
instance.Status.ContainerImages.IronicConductorImage = version.Status.ContainerImages.IronicConductorImage
320+
instance.Status.ContainerImages.IronicGraphicalConsoleImage = version.Status.ContainerImages.IronicGraphicalConsoleImage
318321
instance.Status.ContainerImages.IronicInspectorImage = version.Status.ContainerImages.IronicInspectorImage
319322
instance.Status.ContainerImages.IronicNeutronAgentImage = version.Status.ContainerImages.IronicNeutronAgentImage
320323
instance.Status.ContainerImages.IronicPxeImage = version.Status.ContainerImages.IronicPxeImage
@@ -350,6 +353,7 @@ func IronicImageMatch(ctx context.Context, controlPlane *corev1beta1.OpenStackCo
350353
if controlPlane.Spec.Ironic.Enabled {
351354
if !stringPointersEqual(controlPlane.Status.ContainerImages.IronicAPIImage, version.Status.ContainerImages.IronicAPIImage) ||
352355
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicConductorImage, version.Status.ContainerImages.IronicConductorImage) ||
356+
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicGraphicalConsoleImage, version.Status.ContainerImages.IronicGraphicalConsoleImage) ||
353357
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicInspectorImage, version.Status.ContainerImages.IronicInspectorImage) ||
354358
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicNeutronAgentImage, version.Status.ContainerImages.IronicNeutronAgentImage) ||
355359
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicPxeImage, version.Status.ContainerImages.IronicPxeImage) ||

0 commit comments

Comments
 (0)