Skip to content

Commit 7a06940

Browse files
stevebsteveb
committed
Add CSV entries for new graphical console images
The GraphicalConsoles attribute is a feature flag and setting it to Enabled won't be supported in the RHOSO-18 timeframe, this means that there is not expected to be Antelope versions of the new images IronicGraphicalConsoleImage and IronicNovncImage. These images will not be pulled in the default case. This change is proposed now to support future feature development. Jira: OSPRH-20211
1 parent c7bbe1f commit 7a06940

File tree

10 files changed

+85
-0
lines changed

10 files changed

+85
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16071,10 +16071,14 @@ spec:
1607116071
type: string
1607216072
ironicConductorImage:
1607316073
type: string
16074+
ironicGraphicalConsoleImage:
16075+
type: string
1607416076
ironicInspectorImage:
1607516077
type: string
1607616078
ironicNeutronAgentImage:
1607716079
type: string
16080+
ironicNovncImage:
16081+
type: string
1607816082
ironicPxeImage:
1607916083
type: string
1608016084
ironicPythonAgentImage:

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,14 @@ spec:
143143
type: string
144144
ironicConductorImage:
145145
type: string
146+
ironicGraphicalConsoleImage:
147+
type: string
146148
ironicInspectorImage:
147149
type: string
148150
ironicNeutronAgentImage:
149151
type: string
152+
ironicNovncImage:
153+
type: string
150154
ironicPxeImage:
151155
type: string
152156
ironicPythonAgentImage:
@@ -375,10 +379,14 @@ spec:
375379
type: string
376380
ironicConductorImage:
377381
type: string
382+
ironicGraphicalConsoleImage:
383+
type: string
378384
ironicInspectorImage:
379385
type: string
380386
ironicNeutronAgentImage:
381387
type: string
388+
ironicNovncImage:
389+
type: string
382390
ironicPxeImage:
383391
type: string
384392
ironicPythonAgentImage:
@@ -571,10 +579,14 @@ spec:
571579
type: string
572580
ironicConductorImage:
573581
type: string
582+
ironicGraphicalConsoleImage:
583+
type: string
574584
ironicInspectorImage:
575585
type: string
576586
ironicNeutronAgentImage:
577587
type: string
588+
ironicNovncImage:
589+
type: string
578590
ironicPxeImage:
579591
type: string
580592
ironicPythonAgentImage:
@@ -779,10 +791,14 @@ spec:
779791
type: string
780792
ironicConductorImage:
781793
type: string
794+
ironicGraphicalConsoleImage:
795+
type: string
782796
ironicInspectorImage:
783797
type: string
784798
ironicNeutronAgentImage:
785799
type: string
800+
ironicNovncImage:
801+
type: string
786802
ironicPxeImage:
787803
type: string
788804
ironicPythonAgentImage:

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,10 @@ type ContainerTemplate struct {
128128
InfraRedisImage *string `json:"infraRedisImage,omitempty"`
129129
IronicAPIImage *string `json:"ironicAPIImage,omitempty"`
130130
IronicConductorImage *string `json:"ironicConductorImage,omitempty"`
131+
IronicGraphicalConsoleImage *string `json:"ironicGraphicalConsoleImage,omitempty"`
131132
IronicInspectorImage *string `json:"ironicInspectorImage,omitempty"`
132133
IronicNeutronAgentImage *string `json:"ironicNeutronAgentImage,omitempty"`
134+
IronicNovncImage *string `json:"ironicNovncImage,omitempty"`
133135
IronicPxeImage *string `json:"ironicPxeImage,omitempty"`
134136
IronicPythonAgentImage *string `json:"ironicPythonAgentImage,omitempty"`
135137
KeystoneAPIImage *string `json:"keystoneAPIImage,omitempty"`

‎apis/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
@@ -16237,10 +16237,14 @@ spec:
1623716237
type: string
1623816238
ironicConductorImage:
1623916239
type: string
16240+
ironicGraphicalConsoleImage:
16241+
type: string
1624016242
ironicInspectorImage:
1624116243
type: string
1624216244
ironicNeutronAgentImage:
1624316245
type: string
16246+
ironicNovncImage:
16247+
type: string
1624416248
ironicPxeImage:
1624516249
type: string
1624616250
ironicPythonAgentImage:
@@ -17860,10 +17864,14 @@ spec:
1786017864
type: string
1786117865
ironicConductorImage:
1786217866
type: string
17867+
ironicGraphicalConsoleImage:
17868+
type: string
1786317869
ironicInspectorImage:
1786417870
type: string
1786517871
ironicNeutronAgentImage:
1786617872
type: string
17873+
ironicNovncImage:
17874+
type: string
1786717875
ironicPxeImage:
1786817876
type: string
1786917877
ironicPythonAgentImage:
@@ -18092,10 +18100,14 @@ spec:
1809218100
type: string
1809318101
ironicConductorImage:
1809418102
type: string
18103+
ironicGraphicalConsoleImage:
18104+
type: string
1809518105
ironicInspectorImage:
1809618106
type: string
1809718107
ironicNeutronAgentImage:
1809818108
type: string
18109+
ironicNovncImage:
18110+
type: string
1809918111
ironicPxeImage:
1810018112
type: string
1810118113
ironicPythonAgentImage:
@@ -18288,10 +18300,14 @@ spec:
1828818300
type: string
1828918301
ironicConductorImage:
1829018302
type: string
18303+
ironicGraphicalConsoleImage:
18304+
type: string
1829118305
ironicInspectorImage:
1829218306
type: string
1829318307
ironicNeutronAgentImage:
1829418308
type: string
18309+
ironicNovncImage:
18310+
type: string
1829518311
ironicPxeImage:
1829618312
type: string
1829718313
ironicPythonAgentImage:
@@ -18496,10 +18512,14 @@ spec:
1849618512
type: string
1849718513
ironicConductorImage:
1849818514
type: string
18515+
ironicGraphicalConsoleImage:
18516+
type: string
1849918517
ironicInspectorImage:
1850018518
type: string
1850118519
ironicNeutronAgentImage:
1850218520
type: string
18521+
ironicNovncImage:
18522+
type: string
1850318523
ironicPxeImage:
1850418524
type: string
1850518525
ironicPythonAgentImage:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16071,10 +16071,14 @@ spec:
1607116071
type: string
1607216072
ironicConductorImage:
1607316073
type: string
16074+
ironicGraphicalConsoleImage:
16075+
type: string
1607416076
ironicInspectorImage:
1607516077
type: string
1607616078
ironicNeutronAgentImage:
1607716079
type: string
16080+
ironicNovncImage:
16081+
type: string
1607816082
ironicPxeImage:
1607916083
type: string
1608016084
ironicPythonAgentImage:

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,14 @@ spec:
143143
type: string
144144
ironicConductorImage:
145145
type: string
146+
ironicGraphicalConsoleImage:
147+
type: string
146148
ironicInspectorImage:
147149
type: string
148150
ironicNeutronAgentImage:
149151
type: string
152+
ironicNovncImage:
153+
type: string
150154
ironicPxeImage:
151155
type: string
152156
ironicPythonAgentImage:
@@ -375,10 +379,14 @@ spec:
375379
type: string
376380
ironicConductorImage:
377381
type: string
382+
ironicGraphicalConsoleImage:
383+
type: string
378384
ironicInspectorImage:
379385
type: string
380386
ironicNeutronAgentImage:
381387
type: string
388+
ironicNovncImage:
389+
type: string
382390
ironicPxeImage:
383391
type: string
384392
ironicPythonAgentImage:
@@ -571,10 +579,14 @@ spec:
571579
type: string
572580
ironicConductorImage:
573581
type: string
582+
ironicGraphicalConsoleImage:
583+
type: string
574584
ironicInspectorImage:
575585
type: string
576586
ironicNeutronAgentImage:
577587
type: string
588+
ironicNovncImage:
589+
type: string
578590
ironicPxeImage:
579591
type: string
580592
ironicPythonAgentImage:
@@ -779,10 +791,14 @@ spec:
779791
type: string
780792
ironicConductorImage:
781793
type: string
794+
ironicGraphicalConsoleImage:
795+
type: string
782796
ironicInspectorImage:
783797
type: string
784798
ironicNeutronAgentImage:
785799
type: string
800+
ironicNovncImage:
801+
type: string
786802
ironicPxeImage:
787803
type: string
788804
ironicPythonAgentImage:

‎pkg/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
return ctrl.Result{}, nil
@@ -173,8 +175,10 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
173175

174176
ironic.Spec.Images.API = *version.Status.ContainerImages.IronicAPIImage
175177
ironic.Spec.Images.Conductor = *version.Status.ContainerImages.IronicConductorImage
178+
ironic.Spec.Images.GraphicalConsole = *version.Status.ContainerImages.IronicGraphicalConsoleImage
176179
ironic.Spec.Images.Inspector = *version.Status.ContainerImages.IronicInspectorImage
177180
ironic.Spec.Images.NeutronAgent = *version.Status.ContainerImages.IronicNeutronAgentImage
181+
ironic.Spec.Images.NoVNCProxy = *version.Status.ContainerImages.IronicNovncImage
178182
ironic.Spec.Images.Pxe = *version.Status.ContainerImages.IronicPxeImage
179183
ironic.Spec.Images.IronicPythonAgent = *version.Status.ContainerImages.IronicPythonAgentImage
180184

@@ -206,8 +210,10 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
206210
Log.Info("Ironic ready condition is true")
207211
instance.Status.ContainerImages.IronicAPIImage = version.Status.ContainerImages.IronicAPIImage
208212
instance.Status.ContainerImages.IronicConductorImage = version.Status.ContainerImages.IronicConductorImage
213+
instance.Status.ContainerImages.IronicGraphicalConsoleImage = version.Status.ContainerImages.IronicGraphicalConsoleImage
209214
instance.Status.ContainerImages.IronicInspectorImage = version.Status.ContainerImages.IronicInspectorImage
210215
instance.Status.ContainerImages.IronicNeutronAgentImage = version.Status.ContainerImages.IronicNeutronAgentImage
216+
instance.Status.ContainerImages.IronicNovncImage = version.Status.ContainerImages.IronicNovncImage
211217
instance.Status.ContainerImages.IronicPxeImage = version.Status.ContainerImages.IronicPxeImage
212218
instance.Status.ContainerImages.IronicPythonAgentImage = version.Status.ContainerImages.IronicPythonAgentImage
213219
instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneIronicReadyCondition, corev1beta1.OpenStackControlPlaneIronicReadyMessage)
@@ -241,8 +247,10 @@ func IronicImageMatch(ctx context.Context, controlPlane *corev1beta1.OpenStackCo
241247
if controlPlane.Spec.Ironic.Enabled {
242248
if !stringPointersEqual(controlPlane.Status.ContainerImages.IronicAPIImage, version.Status.ContainerImages.IronicAPIImage) ||
243249
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicConductorImage, version.Status.ContainerImages.IronicConductorImage) ||
250+
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicGraphicalConsoleImage, version.Status.ContainerImages.IronicGraphicalConsoleImage) ||
244251
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicInspectorImage, version.Status.ContainerImages.IronicInspectorImage) ||
245252
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicNeutronAgentImage, version.Status.ContainerImages.IronicNeutronAgentImage) ||
253+
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicNovncImage, version.Status.ContainerImages.IronicNovncImage) ||
246254
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicPxeImage, version.Status.ContainerImages.IronicPxeImage) ||
247255
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicPythonAgentImage, version.Status.ContainerImages.IronicPythonAgentImage) {
248256
Log.Info("Ironic images do not match")

‎pkg/openstack/version.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,10 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
160160
InfraRedisImage: getImg(instance.Spec.CustomContainerImages.InfraRedisImage, defaults.InfraRedisImage),
161161
IronicAPIImage: getImg(instance.Spec.CustomContainerImages.IronicAPIImage, defaults.IronicAPIImage),
162162
IronicConductorImage: getImg(instance.Spec.CustomContainerImages.IronicConductorImage, defaults.IronicConductorImage),
163+
IronicGraphicalConsoleImage: getImg(instance.Spec.CustomContainerImages.IronicGraphicalConsoleImage, defaults.IronicGraphicalConsoleImage),
163164
IronicInspectorImage: getImg(instance.Spec.CustomContainerImages.IronicInspectorImage, defaults.IronicInspectorImage),
164165
IronicNeutronAgentImage: getImg(instance.Spec.CustomContainerImages.IronicNeutronAgentImage, defaults.IronicNeutronAgentImage),
166+
IronicNovncImage: getImg(instance.Spec.CustomContainerImages.IronicNovncImage, defaults.IronicNovncImage),
165167
IronicPxeImage: getImg(instance.Spec.CustomContainerImages.IronicPxeImage, defaults.IronicPxeImage),
166168
IronicPythonAgentImage: getImg(instance.Spec.CustomContainerImages.IronicPythonAgentImage, defaults.IronicPythonAgentImage),
167169
KeystoneAPIImage: getImg(instance.Spec.CustomContainerImages.KeystoneAPIImage, defaults.KeystoneAPIImage),

‎tests/functional/ctlplane/openstackversion_controller_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ var _ = Describe("OpenStackOperator controller", func() {
149149
g.Expect(version.Status.ContainerImages.InfraRedisImage).ShouldNot(BeNil())
150150
g.Expect(version.Status.ContainerImages.IronicAPIImage).ShouldNot(BeNil())
151151
g.Expect(version.Status.ContainerImages.IronicConductorImage).ShouldNot(BeNil())
152+
//TODO(stevebaker) uncomment when these images are available
153+
// g.Expect(version.Status.ContainerImages.IronicGraphicalConsoleImage).ShouldNot(BeNil())
154+
// g.Expect(version.Status.ContainerImages.IronicNovncImage).ShouldNot(BeNil())
152155
g.Expect(version.Status.ContainerImages.IronicInspectorImage).ShouldNot(BeNil())
153156
g.Expect(version.Status.ContainerImages.IronicNeutronAgentImage).ShouldNot(BeNil())
154157
g.Expect(version.Status.ContainerImages.IronicPxeImage).ShouldNot(BeNil())

0 commit comments

Comments
 (0)