Skip to content

Commit aae554f

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 f3a5bdb commit aae554f

12 files changed

Lines changed: 89 additions & 0 deletions

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19471,10 +19471,14 @@ spec:
1947119471
type: string
1947219472
ironicConductorImage:
1947319473
type: string
19474+
ironicGraphicalConsoleImage:
19475+
type: string
1947419476
ironicInspectorImage:
1947519477
type: string
1947619478
ironicNeutronAgentImage:
1947719479
type: string
19480+
ironicNovncImage:
19481+
type: string
1947819482
ironicPxeImage:
1947919483
type: string
1948019484
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:
@@ -403,10 +407,14 @@ spec:
403407
type: string
404408
ironicConductorImage:
405409
type: string
410+
ironicGraphicalConsoleImage:
411+
type: string
406412
ironicInspectorImage:
407413
type: string
408414
ironicNeutronAgentImage:
409415
type: string
416+
ironicNovncImage:
417+
type: string
410418
ironicPxeImage:
411419
type: string
412420
ironicPythonAgentImage:
@@ -605,10 +613,14 @@ spec:
605613
type: string
606614
ironicConductorImage:
607615
type: string
616+
ironicGraphicalConsoleImage:
617+
type: string
608618
ironicInspectorImage:
609619
type: string
610620
ironicNeutronAgentImage:
611621
type: string
622+
ironicNovncImage:
623+
type: string
612624
ironicPxeImage:
613625
type: string
614626
ironicPythonAgentImage:
@@ -833,10 +845,14 @@ spec:
833845
type: string
834846
ironicConductorImage:
835847
type: string
848+
ironicGraphicalConsoleImage:
849+
type: string
836850
ironicInspectorImage:
837851
type: string
838852
ironicNeutronAgentImage:
839853
type: string
854+
ironicNovncImage:
855+
type: string
840856
ironicPxeImage:
841857
type: string
842858
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
@@ -20500,10 +20500,14 @@ spec:
2050020500
type: string
2050120501
ironicConductorImage:
2050220502
type: string
20503+
ironicGraphicalConsoleImage:
20504+
type: string
2050320505
ironicInspectorImage:
2050420506
type: string
2050520507
ironicNeutronAgentImage:
2050620508
type: string
20509+
ironicNovncImage:
20510+
type: string
2050720511
ironicPxeImage:
2050820512
type: string
2050920513
ironicPythonAgentImage:
@@ -23045,10 +23049,14 @@ spec:
2304523049
type: string
2304623050
ironicConductorImage:
2304723051
type: string
23052+
ironicGraphicalConsoleImage:
23053+
type: string
2304823054
ironicInspectorImage:
2304923055
type: string
2305023056
ironicNeutronAgentImage:
2305123057
type: string
23058+
ironicNovncImage:
23059+
type: string
2305223060
ironicPxeImage:
2305323061
type: string
2305423062
ironicPythonAgentImage:
@@ -23297,10 +23305,14 @@ spec:
2329723305
type: string
2329823306
ironicConductorImage:
2329923307
type: string
23308+
ironicGraphicalConsoleImage:
23309+
type: string
2330023310
ironicInspectorImage:
2330123311
type: string
2330223312
ironicNeutronAgentImage:
2330323313
type: string
23314+
ironicNovncImage:
23315+
type: string
2330423316
ironicPxeImage:
2330523317
type: string
2330623318
ironicPythonAgentImage:
@@ -23499,10 +23511,14 @@ spec:
2349923511
type: string
2350023512
ironicConductorImage:
2350123513
type: string
23514+
ironicGraphicalConsoleImage:
23515+
type: string
2350223516
ironicInspectorImage:
2350323517
type: string
2350423518
ironicNeutronAgentImage:
2350523519
type: string
23520+
ironicNovncImage:
23521+
type: string
2350623522
ironicPxeImage:
2350723523
type: string
2350823524
ironicPythonAgentImage:
@@ -23727,10 +23743,14 @@ spec:
2372723743
type: string
2372823744
ironicConductorImage:
2372923745
type: string
23746+
ironicGraphicalConsoleImage:
23747+
type: string
2373023748
ironicInspectorImage:
2373123749
type: string
2373223750
ironicNeutronAgentImage:
2373323751
type: string
23752+
ironicNovncImage:
23753+
type: string
2373423754
ironicPxeImage:
2373523755
type: string
2373623756
ironicPythonAgentImage:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19471,10 +19471,14 @@ spec:
1947119471
type: string
1947219472
ironicConductorImage:
1947319473
type: string
19474+
ironicGraphicalConsoleImage:
19475+
type: string
1947419476
ironicInspectorImage:
1947519477
type: string
1947619478
ironicNeutronAgentImage:
1947719479
type: string
19480+
ironicNovncImage:
19481+
type: string
1947819482
ironicPxeImage:
1947919483
type: string
1948019484
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:
@@ -403,10 +407,14 @@ spec:
403407
type: string
404408
ironicConductorImage:
405409
type: string
410+
ironicGraphicalConsoleImage:
411+
type: string
406412
ironicInspectorImage:
407413
type: string
408414
ironicNeutronAgentImage:
409415
type: string
416+
ironicNovncImage:
417+
type: string
410418
ironicPxeImage:
411419
type: string
412420
ironicPythonAgentImage:
@@ -605,10 +613,14 @@ spec:
605613
type: string
606614
ironicConductorImage:
607615
type: string
616+
ironicGraphicalConsoleImage:
617+
type: string
608618
ironicInspectorImage:
609619
type: string
610620
ironicNeutronAgentImage:
611621
type: string
622+
ironicNovncImage:
623+
type: string
612624
ironicPxeImage:
613625
type: string
614626
ironicPythonAgentImage:
@@ -833,10 +845,14 @@ spec:
833845
type: string
834846
ironicConductorImage:
835847
type: string
848+
ironicGraphicalConsoleImage:
849+
type: string
836850
ironicInspectorImage:
837851
type: string
838852
ironicNeutronAgentImage:
839853
type: string
854+
ironicNovncImage:
855+
type: string
840856
ironicPxeImage:
841857
type: string
842858
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)
@@ -271,8 +273,10 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
271273

272274
ironic.Spec.Images.API = *version.Status.ContainerImages.IronicAPIImage
273275
ironic.Spec.Images.Conductor = *version.Status.ContainerImages.IronicConductorImage
276+
ironic.Spec.Images.GraphicalConsole = *version.Status.ContainerImages.IronicGraphicalConsoleImage
274277
ironic.Spec.Images.Inspector = *version.Status.ContainerImages.IronicInspectorImage
275278
ironic.Spec.Images.NeutronAgent = *version.Status.ContainerImages.IronicNeutronAgentImage
279+
ironic.Spec.Images.NoVNCProxy = *version.Status.ContainerImages.IronicNovncImage
276280
ironic.Spec.Images.Pxe = *version.Status.ContainerImages.IronicPxeImage
277281
ironic.Spec.Images.IronicPythonAgent = *version.Status.ContainerImages.IronicPythonAgentImage
278282

@@ -315,8 +319,10 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
315319
Log.Info("Ironic ready condition is true")
316320
instance.Status.ContainerImages.IronicAPIImage = version.Status.ContainerImages.IronicAPIImage
317321
instance.Status.ContainerImages.IronicConductorImage = version.Status.ContainerImages.IronicConductorImage
322+
instance.Status.ContainerImages.IronicGraphicalConsoleImage = version.Status.ContainerImages.IronicGraphicalConsoleImage
318323
instance.Status.ContainerImages.IronicInspectorImage = version.Status.ContainerImages.IronicInspectorImage
319324
instance.Status.ContainerImages.IronicNeutronAgentImage = version.Status.ContainerImages.IronicNeutronAgentImage
325+
instance.Status.ContainerImages.IronicNovncImage = version.Status.ContainerImages.IronicNovncImage
320326
instance.Status.ContainerImages.IronicPxeImage = version.Status.ContainerImages.IronicPxeImage
321327
instance.Status.ContainerImages.IronicPythonAgentImage = version.Status.ContainerImages.IronicPythonAgentImage
322328
instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneIronicReadyCondition, corev1beta1.OpenStackControlPlaneIronicReadyMessage)
@@ -350,8 +356,10 @@ func IronicImageMatch(ctx context.Context, controlPlane *corev1beta1.OpenStackCo
350356
if controlPlane.Spec.Ironic.Enabled {
351357
if !stringPointersEqual(controlPlane.Status.ContainerImages.IronicAPIImage, version.Status.ContainerImages.IronicAPIImage) ||
352358
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicConductorImage, version.Status.ContainerImages.IronicConductorImage) ||
359+
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicGraphicalConsoleImage, version.Status.ContainerImages.IronicGraphicalConsoleImage) ||
353360
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicInspectorImage, version.Status.ContainerImages.IronicInspectorImage) ||
354361
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicNeutronAgentImage, version.Status.ContainerImages.IronicNeutronAgentImage) ||
362+
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicNovncImage, version.Status.ContainerImages.IronicNovncImage) ||
355363
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicPxeImage, version.Status.ContainerImages.IronicPxeImage) ||
356364
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicPythonAgentImage, version.Status.ContainerImages.IronicPythonAgentImage) {
357365
Log.Info("Ironic images do not match")

0 commit comments

Comments
 (0)