Skip to content

Commit 6f635f2

Browse files
stevebsteveb
committed
WIP Add CSV entries for new graphical console images
1 parent 8fb6d05 commit 6f635f2

File tree

10 files changed

+71
-0
lines changed

10 files changed

+71
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16034,10 +16034,14 @@ spec:
1603416034
type: string
1603516035
ironicConductorImage:
1603616036
type: string
16037+
ironicGraphicalConsoleImage:
16038+
type: string
1603716039
ironicInspectorImage:
1603816040
type: string
1603916041
ironicNeutronAgentImage:
1604016042
type: string
16043+
ironicNovncImage:
16044+
type: string
1604116045
ironicPxeImage:
1604216046
type: string
1604316047
ironicPythonAgentImage:

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

Lines changed: 12 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:

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,10 @@ type ContainerTemplate struct {
127127
InfraRedisImage *string `json:"infraRedisImage,omitempty"`
128128
IronicAPIImage *string `json:"ironicAPIImage,omitempty"`
129129
IronicConductorImage *string `json:"ironicConductorImage,omitempty"`
130+
IronicGraphicalConsoleImage *string `json:"ironicGraphicalConsoleImage,omitempty"`
130131
IronicInspectorImage *string `json:"ironicInspectorImage,omitempty"`
131132
IronicNeutronAgentImage *string `json:"ironicNeutronAgentImage,omitempty"`
133+
IronicNovncImage *string `json:"ironicNovncImage,omitempty"`
132134
IronicPxeImage *string `json:"ironicPxeImage,omitempty"`
133135
IronicPythonAgentImage *string `json:"ironicPythonAgentImage,omitempty"`
134136
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.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16034,10 +16034,14 @@ spec:
1603416034
type: string
1603516035
ironicConductorImage:
1603616036
type: string
16037+
ironicGraphicalConsoleImage:
16038+
type: string
1603716039
ironicInspectorImage:
1603816040
type: string
1603916041
ironicNeutronAgentImage:
1604016042
type: string
16043+
ironicNovncImage:
16044+
type: string
1604116045
ironicPxeImage:
1604216046
type: string
1604316047
ironicPythonAgentImage:

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

Lines changed: 12 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:

‎config/operator/deployment/kustomization.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,16 @@ images:
1414
- name: controller
1515
newName: quay.io/openstack-k8s-operators/openstack-operator
1616
newTag: latest
17+
patches:
18+
- patch: '[{"op": "replace", "path": "/spec/template/spec/containers/1/env/0", "value":
19+
{"name": "OPENSTACK_RELEASE_VERSION", "value": "0.4.0-1759368025"}}]'
20+
target:
21+
kind: Deployment
22+
name: openstack-operator-controller-operator
23+
namespace: system
24+
- patch: '[{"op": "replace", "path": "/spec/template/spec/containers/1/env/1", "value":
25+
{"name": "OPERATOR_IMAGE_URL", "value": "quay.io/openstack-k8s-operators/openstack-operator:latest"}}]'
26+
target:
27+
kind: Deployment
28+
name: openstack-operator-controller-operator
29+
namespace: system

‎pkg/openstack/ironic.go‎

Lines changed: 10 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,12 @@ 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+
// TODO(stevebaker) uncomment when spec changes are available
179+
// ironic.Spec.Images.GraphicalConsole = *version.Status.ContainerImages.IronicGraphicalConsoleImage
176180
ironic.Spec.Images.Inspector = *version.Status.ContainerImages.IronicInspectorImage
177181
ironic.Spec.Images.NeutronAgent = *version.Status.ContainerImages.IronicNeutronAgentImage
182+
// TODO(stevebaker) uncomment when spec changes are available
183+
// ironic.Spec.Images.NoVNCProxy = *version.Status.ContainerImages.IronicNovncImage
178184
ironic.Spec.Images.Pxe = *version.Status.ContainerImages.IronicPxeImage
179185
ironic.Spec.Images.IronicPythonAgent = *version.Status.ContainerImages.IronicPythonAgentImage
180186

@@ -206,8 +212,10 @@ func ReconcileIronic(ctx context.Context, instance *corev1beta1.OpenStackControl
206212
Log.Info("Ironic ready condition is true")
207213
instance.Status.ContainerImages.IronicAPIImage = version.Status.ContainerImages.IronicAPIImage
208214
instance.Status.ContainerImages.IronicConductorImage = version.Status.ContainerImages.IronicConductorImage
215+
instance.Status.ContainerImages.IronicGraphicalConsoleImage = version.Status.ContainerImages.IronicGraphicalConsoleImage
209216
instance.Status.ContainerImages.IronicInspectorImage = version.Status.ContainerImages.IronicInspectorImage
210217
instance.Status.ContainerImages.IronicNeutronAgentImage = version.Status.ContainerImages.IronicNeutronAgentImage
218+
instance.Status.ContainerImages.IronicNovncImage = version.Status.ContainerImages.IronicNovncImage
211219
instance.Status.ContainerImages.IronicPxeImage = version.Status.ContainerImages.IronicPxeImage
212220
instance.Status.ContainerImages.IronicPythonAgentImage = version.Status.ContainerImages.IronicPythonAgentImage
213221
instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneIronicReadyCondition, corev1beta1.OpenStackControlPlaneIronicReadyMessage)
@@ -241,8 +249,10 @@ func IronicImageMatch(ctx context.Context, controlPlane *corev1beta1.OpenStackCo
241249
if controlPlane.Spec.Ironic.Enabled {
242250
if !stringPointersEqual(controlPlane.Status.ContainerImages.IronicAPIImage, version.Status.ContainerImages.IronicAPIImage) ||
243251
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicConductorImage, version.Status.ContainerImages.IronicConductorImage) ||
252+
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicGraphicalConsoleImage, version.Status.ContainerImages.IronicGraphicalConsoleImage) ||
244253
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicInspectorImage, version.Status.ContainerImages.IronicInspectorImage) ||
245254
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicNeutronAgentImage, version.Status.ContainerImages.IronicNeutronAgentImage) ||
255+
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicNovncImage, version.Status.ContainerImages.IronicNovncImage) ||
246256
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicPxeImage, version.Status.ContainerImages.IronicPxeImage) ||
247257
!stringPointersEqual(controlPlane.Status.ContainerImages.IronicPythonAgentImage, version.Status.ContainerImages.IronicPythonAgentImage) {
248258
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,10 @@ var _ = Describe("OpenStackOperator controller", func() {
148148
g.Expect(version.Status.ContainerImages.InfraRedisImage).ShouldNot(BeNil())
149149
g.Expect(version.Status.ContainerImages.IronicAPIImage).ShouldNot(BeNil())
150150
g.Expect(version.Status.ContainerImages.IronicConductorImage).ShouldNot(BeNil())
151+
g.Expect(version.Status.ContainerImages.IronicGraphicalConsoleImage).ShouldNot(BeNil())
151152
g.Expect(version.Status.ContainerImages.IronicInspectorImage).ShouldNot(BeNil())
152153
g.Expect(version.Status.ContainerImages.IronicNeutronAgentImage).ShouldNot(BeNil())
154+
g.Expect(version.Status.ContainerImages.IronicNovncImage).ShouldNot(BeNil())
153155
g.Expect(version.Status.ContainerImages.IronicPxeImage).ShouldNot(BeNil())
154156
g.Expect(version.Status.ContainerImages.IronicPythonAgentImage).ShouldNot(BeNil())
155157
g.Expect(version.Status.ContainerImages.KeystoneAPIImage).ShouldNot(BeNil())

0 commit comments

Comments
 (0)