Skip to content

Commit d7cbd45

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. A CSV entry has also been added for the novnc-proxy image, which is configured with the existing s2i openstack-ironic-api image. Jira: OSPRH-20211
1 parent e4ddd09 commit d7cbd45

12 files changed

Lines changed: 90 additions & 0 deletions

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19939,10 +19939,14 @@ spec:
1993919939
type: string
1994019940
ironicConductorImage:
1994119941
type: string
19942+
ironicGraphicalConsoleImage:
19943+
type: string
1994219944
ironicInspectorImage:
1994319945
type: string
1994419946
ironicNeutronAgentImage:
1994519947
type: string
19948+
ironicNovncImage:
19949+
type: string
1994619950
ironicPxeImage:
1994719951
type: string
1994819952
ironicPythonAgentImage:

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,14 @@ spec:
151151
type: string
152152
ironicConductorImage:
153153
type: string
154+
ironicGraphicalConsoleImage:
155+
type: string
154156
ironicInspectorImage:
155157
type: string
156158
ironicNeutronAgentImage:
157159
type: string
160+
ironicNovncImage:
161+
type: string
158162
ironicPxeImage:
159163
type: string
160164
ironicPythonAgentImage:
@@ -405,10 +409,14 @@ spec:
405409
type: string
406410
ironicConductorImage:
407411
type: string
412+
ironicGraphicalConsoleImage:
413+
type: string
408414
ironicInspectorImage:
409415
type: string
410416
ironicNeutronAgentImage:
411417
type: string
418+
ironicNovncImage:
419+
type: string
412420
ironicPxeImage:
413421
type: string
414422
ironicPythonAgentImage:
@@ -609,10 +617,14 @@ spec:
609617
type: string
610618
ironicConductorImage:
611619
type: string
620+
ironicGraphicalConsoleImage:
621+
type: string
612622
ironicInspectorImage:
613623
type: string
614624
ironicNeutronAgentImage:
615625
type: string
626+
ironicNovncImage:
627+
type: string
616628
ironicPxeImage:
617629
type: string
618630
ironicPythonAgentImage:
@@ -839,10 +851,14 @@ spec:
839851
type: string
840852
ironicConductorImage:
841853
type: string
854+
ironicGraphicalConsoleImage:
855+
type: string
842856
ironicInspectorImage:
843857
type: string
844858
ironicNeutronAgentImage:
845859
type: string
860+
ironicNovncImage:
861+
type: string
846862
ironicPxeImage:
847863
type: string
848864
ironicPythonAgentImage:

‎api/core/v1beta1/openstackversion_types.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,10 @@ 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"`
260+
IronicNovncImage *string `json:"ironicNovncImage,omitempty"`
259261
IronicPxeImage *string `json:"ironicPxeImage,omitempty"`
260262
IronicPythonAgentImage *string `json:"ironicPythonAgentImage,omitempty"`
261263
KeystoneAPIImage *string `json:"keystoneAPIImage,omitempty"`

‎api/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 10 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: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20968,10 +20968,14 @@ spec:
2096820968
type: string
2096920969
ironicConductorImage:
2097020970
type: string
20971+
ironicGraphicalConsoleImage:
20972+
type: string
2097120973
ironicInspectorImage:
2097220974
type: string
2097320975
ironicNeutronAgentImage:
2097420976
type: string
20977+
ironicNovncImage:
20978+
type: string
2097520979
ironicPxeImage:
2097620980
type: string
2097720981
ironicPythonAgentImage:
@@ -23598,10 +23602,14 @@ spec:
2359823602
type: string
2359923603
ironicConductorImage:
2360023604
type: string
23605+
ironicGraphicalConsoleImage:
23606+
type: string
2360123607
ironicInspectorImage:
2360223608
type: string
2360323609
ironicNeutronAgentImage:
2360423610
type: string
23611+
ironicNovncImage:
23612+
type: string
2360523613
ironicPxeImage:
2360623614
type: string
2360723615
ironicPythonAgentImage:
@@ -23852,10 +23860,14 @@ spec:
2385223860
type: string
2385323861
ironicConductorImage:
2385423862
type: string
23863+
ironicGraphicalConsoleImage:
23864+
type: string
2385523865
ironicInspectorImage:
2385623866
type: string
2385723867
ironicNeutronAgentImage:
2385823868
type: string
23869+
ironicNovncImage:
23870+
type: string
2385923871
ironicPxeImage:
2386023872
type: string
2386123873
ironicPythonAgentImage:
@@ -24056,10 +24068,14 @@ spec:
2405624068
type: string
2405724069
ironicConductorImage:
2405824070
type: string
24071+
ironicGraphicalConsoleImage:
24072+
type: string
2405924073
ironicInspectorImage:
2406024074
type: string
2406124075
ironicNeutronAgentImage:
2406224076
type: string
24077+
ironicNovncImage:
24078+
type: string
2406324079
ironicPxeImage:
2406424080
type: string
2406524081
ironicPythonAgentImage:
@@ -24286,10 +24302,14 @@ spec:
2428624302
type: string
2428724303
ironicConductorImage:
2428824304
type: string
24305+
ironicGraphicalConsoleImage:
24306+
type: string
2428924307
ironicInspectorImage:
2429024308
type: string
2429124309
ironicNeutronAgentImage:
2429224310
type: string
24311+
ironicNovncImage:
24312+
type: string
2429324313
ironicPxeImage:
2429424314
type: string
2429524315
ironicPythonAgentImage:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19939,10 +19939,14 @@ spec:
1993919939
type: string
1994019940
ironicConductorImage:
1994119941
type: string
19942+
ironicGraphicalConsoleImage:
19943+
type: string
1994219944
ironicInspectorImage:
1994319945
type: string
1994419946
ironicNeutronAgentImage:
1994519947
type: string
19948+
ironicNovncImage:
19949+
type: string
1994619950
ironicPxeImage:
1994719951
type: string
1994819952
ironicPythonAgentImage:

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,14 @@ spec:
151151
type: string
152152
ironicConductorImage:
153153
type: string
154+
ironicGraphicalConsoleImage:
155+
type: string
154156
ironicInspectorImage:
155157
type: string
156158
ironicNeutronAgentImage:
157159
type: string
160+
ironicNovncImage:
161+
type: string
158162
ironicPxeImage:
159163
type: string
160164
ironicPythonAgentImage:
@@ -405,10 +409,14 @@ spec:
405409
type: string
406410
ironicConductorImage:
407411
type: string
412+
ironicGraphicalConsoleImage:
413+
type: string
408414
ironicInspectorImage:
409415
type: string
410416
ironicNeutronAgentImage:
411417
type: string
418+
ironicNovncImage:
419+
type: string
412420
ironicPxeImage:
413421
type: string
414422
ironicPythonAgentImage:
@@ -609,10 +617,14 @@ spec:
609617
type: string
610618
ironicConductorImage:
611619
type: string
620+
ironicGraphicalConsoleImage:
621+
type: string
612622
ironicInspectorImage:
613623
type: string
614624
ironicNeutronAgentImage:
615625
type: string
626+
ironicNovncImage:
627+
type: string
616628
ironicPxeImage:
617629
type: string
618630
ironicPythonAgentImage:
@@ -839,10 +851,14 @@ spec:
839851
type: string
840852
ironicConductorImage:
841853
type: string
854+
ironicGraphicalConsoleImage:
855+
type: string
842856
ironicInspectorImage:
843857
type: string
844858
ironicNeutronAgentImage:
845859
type: string
860+
ironicNovncImage:
861+
type: string
846862
ironicPxeImage:
847863
type: string
848864
ironicPythonAgentImage:

‎config/operator/default_images.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,14 @@ 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
9395
value: quay.io/openstack-s2i-containers/openstack-ironic-neutron-agent:master-latest
96+
- name: RELATED_IMAGE_IRONIC_NOVNC_IMAGE_URL_DEFAULT
97+
value: quay.io/openstack-s2i-containers/openstack-ironic-api:master-latest
9498
- name: RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT
9599
value: quay.io/podified-antelope-centos9/ironic-python-agent:current-podified
96100
- name: RELATED_IMAGE_KEYSTONE_API_IMAGE_URL_DEFAULT

‎hack/export_related_images.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ 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
26+
export RELATED_IMAGE_IRONIC_NOVNC_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ironic-api:master-latest
2527
export RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/ironic-python-agent:current-podified
2628
export RELATED_IMAGE_OS_CONTAINER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified
2729
export RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified

‎internal/openstack/ironic.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ 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
42+
instance.Status.ContainerImages.IronicNovncImage = nil
4143
instance.Status.ContainerImages.IronicPxeImage = nil
4244
instance.Status.ContainerImages.IronicPythonAgentImage = nil
4345
// Clean up AC CRs when service is disabled (ironic has two: ironic and ironic-inspector)
@@ -275,8 +277,10 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
275277

276278
ironic.Spec.Images.API = *version.Status.ContainerImages.IronicAPIImage
277279
ironic.Spec.Images.Conductor = *version.Status.ContainerImages.IronicConductorImage
280+
ironic.Spec.Images.GraphicalConsole = *version.Status.ContainerImages.IronicGraphicalConsoleImage
278281
ironic.Spec.Images.Inspector = *version.Status.ContainerImages.IronicInspectorImage
279282
ironic.Spec.Images.NeutronAgent = *version.Status.ContainerImages.IronicNeutronAgentImage
283+
ironic.Spec.Images.NoVNCProxy = *version.Status.ContainerImages.IronicNovncImage
280284
ironic.Spec.Images.Pxe = *version.Status.ContainerImages.IronicPxeImage
281285
ironic.Spec.Images.IronicPythonAgent = *version.Status.ContainerImages.IronicPythonAgentImage
282286

@@ -319,8 +323,10 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
319323
Log.Info("Ironic ready condition is true")
320324
instance.Status.ContainerImages.IronicAPIImage = version.Status.ContainerImages.IronicAPIImage
321325
instance.Status.ContainerImages.IronicConductorImage = version.Status.ContainerImages.IronicConductorImage
326+
instance.Status.ContainerImages.IronicGraphicalConsoleImage = version.Status.ContainerImages.IronicGraphicalConsoleImage
322327
instance.Status.ContainerImages.IronicInspectorImage = version.Status.ContainerImages.IronicInspectorImage
323328
instance.Status.ContainerImages.IronicNeutronAgentImage = version.Status.ContainerImages.IronicNeutronAgentImage
329+
instance.Status.ContainerImages.IronicNovncImage = version.Status.ContainerImages.IronicNovncImage
324330
instance.Status.ContainerImages.IronicPxeImage = version.Status.ContainerImages.IronicPxeImage
325331
instance.Status.ContainerImages.IronicPythonAgentImage = version.Status.ContainerImages.IronicPythonAgentImage
326332
instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneIronicReadyCondition, corev1beta1.OpenStackControlPlaneIronicReadyMessage)
@@ -354,8 +360,10 @@ func IronicImageMatch(ctx context.Context, controlPlane *corev1beta1.OpenStackCo
354360
if controlPlane.Spec.Ironic.Enabled {
355361
if !stringPointersEqual(controlPlane.Status.ContainerImages.IronicAPIImage, version.Status.ContainerImages.IronicAPIImage) ||
356362
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicConductorImage, version.Status.ContainerImages.IronicConductorImage) ||
363+
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicGraphicalConsoleImage, version.Status.ContainerImages.IronicGraphicalConsoleImage) ||
357364
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicInspectorImage, version.Status.ContainerImages.IronicInspectorImage) ||
358365
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicNeutronAgentImage, version.Status.ContainerImages.IronicNeutronAgentImage) ||
366+
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicNovncImage, version.Status.ContainerImages.IronicNovncImage) ||
359367
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicPxeImage, version.Status.ContainerImages.IronicPxeImage) ||
360368
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicPythonAgentImage, version.Status.ContainerImages.IronicPythonAgentImage) {
361369
Log.Info("Ironic images do not match")

0 commit comments

Comments
 (0)