Skip to content

Commit a39da18

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 17b1fae commit a39da18

File tree

10 files changed

+85
-0
lines changed

10 files changed

+85
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16565,10 +16565,14 @@ spec:
1656516565
type: string
1656616566
ironicConductorImage:
1656716567
type: string
16568+
ironicGraphicalConsoleImage:
16569+
type: string
1656816570
ironicInspectorImage:
1656916571
type: string
1657016572
ironicNeutronAgentImage:
1657116573
type: string
16574+
ironicNovncImage:
16575+
type: string
1657216576
ironicPxeImage:
1657316577
type: string
1657416578
ironicPythonAgentImage:

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,14 @@ spec:
147147
type: string
148148
ironicConductorImage:
149149
type: string
150+
ironicGraphicalConsoleImage:
151+
type: string
150152
ironicInspectorImage:
151153
type: string
152154
ironicNeutronAgentImage:
153155
type: string
156+
ironicNovncImage:
157+
type: string
154158
ironicPxeImage:
155159
type: string
156160
ironicPythonAgentImage:
@@ -383,10 +387,14 @@ spec:
383387
type: string
384388
ironicConductorImage:
385389
type: string
390+
ironicGraphicalConsoleImage:
391+
type: string
386392
ironicInspectorImage:
387393
type: string
388394
ironicNeutronAgentImage:
389395
type: string
396+
ironicNovncImage:
397+
type: string
390398
ironicPxeImage:
391399
type: string
392400
ironicPythonAgentImage:
@@ -583,10 +591,14 @@ spec:
583591
type: string
584592
ironicConductorImage:
585593
type: string
594+
ironicGraphicalConsoleImage:
595+
type: string
586596
ironicInspectorImage:
587597
type: string
588598
ironicNeutronAgentImage:
589599
type: string
600+
ironicNovncImage:
601+
type: string
590602
ironicPxeImage:
591603
type: string
592604
ironicPythonAgentImage:
@@ -795,10 +807,14 @@ spec:
795807
type: string
796808
ironicConductorImage:
797809
type: string
810+
ironicGraphicalConsoleImage:
811+
type: string
798812
ironicInspectorImage:
799813
type: string
800814
ironicNeutronAgentImage:
801815
type: string
816+
ironicNovncImage:
817+
type: string
802818
ironicPxeImage:
803819
type: string
804820
ironicPythonAgentImage:

‎api/core/v1beta1/openstackversion_types.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,10 @@ type ContainerTemplate struct {
130130
InfraRedisImage *string `json:"infraRedisImage,omitempty"`
131131
IronicAPIImage *string `json:"ironicAPIImage,omitempty"`
132132
IronicConductorImage *string `json:"ironicConductorImage,omitempty"`
133+
IronicGraphicalConsoleImage *string `json:"ironicGraphicalConsoleImage,omitempty"`
133134
IronicInspectorImage *string `json:"ironicInspectorImage,omitempty"`
134135
IronicNeutronAgentImage *string `json:"ironicNeutronAgentImage,omitempty"`
136+
IronicNovncImage *string `json:"ironicNovncImage,omitempty"`
135137
IronicPxeImage *string `json:"ironicPxeImage,omitempty"`
136138
IronicPythonAgentImage *string `json:"ironicPythonAgentImage,omitempty"`
137139
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
@@ -16731,10 +16731,14 @@ spec:
1673116731
type: string
1673216732
ironicConductorImage:
1673316733
type: string
16734+
ironicGraphicalConsoleImage:
16735+
type: string
1673416736
ironicInspectorImage:
1673516737
type: string
1673616738
ironicNeutronAgentImage:
1673716739
type: string
16740+
ironicNovncImage:
16741+
type: string
1673816742
ironicPxeImage:
1673916743
type: string
1674016744
ironicPythonAgentImage:
@@ -18375,10 +18379,14 @@ spec:
1837518379
type: string
1837618380
ironicConductorImage:
1837718381
type: string
18382+
ironicGraphicalConsoleImage:
18383+
type: string
1837818384
ironicInspectorImage:
1837918385
type: string
1838018386
ironicNeutronAgentImage:
1838118387
type: string
18388+
ironicNovncImage:
18389+
type: string
1838218390
ironicPxeImage:
1838318391
type: string
1838418392
ironicPythonAgentImage:
@@ -18611,10 +18619,14 @@ spec:
1861118619
type: string
1861218620
ironicConductorImage:
1861318621
type: string
18622+
ironicGraphicalConsoleImage:
18623+
type: string
1861418624
ironicInspectorImage:
1861518625
type: string
1861618626
ironicNeutronAgentImage:
1861718627
type: string
18628+
ironicNovncImage:
18629+
type: string
1861818630
ironicPxeImage:
1861918631
type: string
1862018632
ironicPythonAgentImage:
@@ -18811,10 +18823,14 @@ spec:
1881118823
type: string
1881218824
ironicConductorImage:
1881318825
type: string
18826+
ironicGraphicalConsoleImage:
18827+
type: string
1881418828
ironicInspectorImage:
1881518829
type: string
1881618830
ironicNeutronAgentImage:
1881718831
type: string
18832+
ironicNovncImage:
18833+
type: string
1881818834
ironicPxeImage:
1881918835
type: string
1882018836
ironicPythonAgentImage:
@@ -19023,10 +19039,14 @@ spec:
1902319039
type: string
1902419040
ironicConductorImage:
1902519041
type: string
19042+
ironicGraphicalConsoleImage:
19043+
type: string
1902619044
ironicInspectorImage:
1902719045
type: string
1902819046
ironicNeutronAgentImage:
1902919047
type: string
19048+
ironicNovncImage:
19049+
type: string
1903019050
ironicPxeImage:
1903119051
type: string
1903219052
ironicPythonAgentImage:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16565,10 +16565,14 @@ spec:
1656516565
type: string
1656616566
ironicConductorImage:
1656716567
type: string
16568+
ironicGraphicalConsoleImage:
16569+
type: string
1656816570
ironicInspectorImage:
1656916571
type: string
1657016572
ironicNeutronAgentImage:
1657116573
type: string
16574+
ironicNovncImage:
16575+
type: string
1657216576
ironicPxeImage:
1657316577
type: string
1657416578
ironicPythonAgentImage:

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,14 @@ spec:
147147
type: string
148148
ironicConductorImage:
149149
type: string
150+
ironicGraphicalConsoleImage:
151+
type: string
150152
ironicInspectorImage:
151153
type: string
152154
ironicNeutronAgentImage:
153155
type: string
156+
ironicNovncImage:
157+
type: string
154158
ironicPxeImage:
155159
type: string
156160
ironicPythonAgentImage:
@@ -383,10 +387,14 @@ spec:
383387
type: string
384388
ironicConductorImage:
385389
type: string
390+
ironicGraphicalConsoleImage:
391+
type: string
386392
ironicInspectorImage:
387393
type: string
388394
ironicNeutronAgentImage:
389395
type: string
396+
ironicNovncImage:
397+
type: string
390398
ironicPxeImage:
391399
type: string
392400
ironicPythonAgentImage:
@@ -583,10 +591,14 @@ spec:
583591
type: string
584592
ironicConductorImage:
585593
type: string
594+
ironicGraphicalConsoleImage:
595+
type: string
586596
ironicInspectorImage:
587597
type: string
588598
ironicNeutronAgentImage:
589599
type: string
600+
ironicNovncImage:
601+
type: string
590602
ironicPxeImage:
591603
type: string
592604
ironicPythonAgentImage:
@@ -795,10 +807,14 @@ spec:
795807
type: string
796808
ironicConductorImage:
797809
type: string
810+
ironicGraphicalConsoleImage:
811+
type: string
798812
ironicInspectorImage:
799813
type: string
800814
ironicNeutronAgentImage:
801815
type: string
816+
ironicNovncImage:
817+
type: string
802818
ironicPxeImage:
803819
type: string
804820
ironicPythonAgentImage:

‎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
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")

‎internal/openstack/version.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,10 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
163163
InfraRedisImage: getImg(instance.Spec.CustomContainerImages.InfraRedisImage, defaults.InfraRedisImage),
164164
IronicAPIImage: getImg(instance.Spec.CustomContainerImages.IronicAPIImage, defaults.IronicAPIImage),
165165
IronicConductorImage: getImg(instance.Spec.CustomContainerImages.IronicConductorImage, defaults.IronicConductorImage),
166+
IronicGraphicalConsoleImage: getImg(instance.Spec.CustomContainerImages.IronicGraphicalConsoleImage, defaults.IronicGraphicalConsoleImage),
166167
IronicInspectorImage: getImg(instance.Spec.CustomContainerImages.IronicInspectorImage, defaults.IronicInspectorImage),
167168
IronicNeutronAgentImage: getImg(instance.Spec.CustomContainerImages.IronicNeutronAgentImage, defaults.IronicNeutronAgentImage),
169+
IronicNovncImage: getImg(instance.Spec.CustomContainerImages.IronicNovncImage, defaults.IronicNovncImage),
168170
IronicPxeImage: getImg(instance.Spec.CustomContainerImages.IronicPxeImage, defaults.IronicPxeImage),
169171
IronicPythonAgentImage: getImg(instance.Spec.CustomContainerImages.IronicPythonAgentImage, defaults.IronicPythonAgentImage),
170172
KeystoneAPIImage: getImg(instance.Spec.CustomContainerImages.KeystoneAPIImage, defaults.KeystoneAPIImage),

‎test/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)