Skip to content

Commit 7db229e

Browse files
stevebsteveb
committed
CRD changes to support ironic graphical consoles
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 e93ae81 commit 7db229e

14 files changed

+85
-4
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16053,10 +16053,14 @@ spec:
1605316053
type: string
1605416054
ironicConductorImage:
1605516055
type: string
16056+
ironicGraphicalConsoleImage:
16057+
type: string
1605616058
ironicInspectorImage:
1605716059
type: string
1605816060
ironicNeutronAgentImage:
1605916061
type: string
16062+
ironicNovncImage:
16063+
type: string
1606016064
ironicPxeImage:
1606116065
type: string
1606216066
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.

‎apis/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.4
55
require (
66
github.com/cert-manager/cert-manager v1.16.5
77
github.com/go-playground/validator/v10 v10.25.0
8-
github.com/onsi/ginkgo/v2 v2.25.3
8+
github.com/onsi/ginkgo/v2 v2.26.0
99
github.com/onsi/gomega v1.38.2
1010
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20251002143431-4d83c0d3d84f
1111
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20251002160033-d2a363bddc32
@@ -14,7 +14,7 @@ require (
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20251002164852-4db724e1298c
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20251002161904-e6aac32a6d8a
1616
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20251002120642-c2d58c6fc03e
17-
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20251003082107-71dab701876e
17+
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20251004062824-dc30ef1bac12
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20251002084815-17073bbaef03
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250929092825-4c2402451077
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250929092825-4c2402451077

‎apis/go.sum‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
9696
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
9797
github.com/onsi/ginkgo/v2 v2.25.3 h1:Ty8+Yi/ayDAGtk4XxmmfUy4GabvM+MegeB4cDLRi6nw=
9898
github.com/onsi/ginkgo/v2 v2.25.3/go.mod h1:43uiyQC4Ed2tkOzLsEYm7hnrb7UJTWHYNsuy3bG/snE=
99+
github.com/onsi/ginkgo/v2 v2.26.0/go.mod h1:qhEywmzWTBUY88kfO0BRvX4py7scov9yR+Az2oavUzw=
99100
github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
100101
github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
101102
github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e h1:E1OdwSpqWuDPCedyUt0GEdoAE+r5TXy7YS21yNEo+2U=
@@ -116,6 +117,8 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20251002120642-c
116117
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20251002120642-c2d58c6fc03e/go.mod h1:LfqzznghLpo+b9jVgyvqUoOZMcc3Ff0gXSmLLtFsj9w=
117118
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20251003082107-71dab701876e h1:x3aaYGnD4++KmrzixgsfdLcla8Fo8u5RD/83MQr+Pp0=
118119
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20251003082107-71dab701876e/go.mod h1:qtm795Dj44ZLFuxfbwv4W2cga69yacmCWcFKoqpzIZI=
120+
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20251004062824-dc30ef1bac12 h1:8vQpLEIK2zdxxe8AwcnuNhqWGWtHv47062bbhVWECEI=
121+
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20251004062824-dc30ef1bac12/go.mod h1:5dJk/OcH3884HIPDVDDXsVkOF77WaE/encYCBlSKfaI=
119122
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20251002084815-17073bbaef03 h1:6yHHmTZ/AM+RIR3EBuXgrIXTsKE2bGIOfX4v5FrNcho=
120123
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20251002084815-17073bbaef03/go.mod h1:fuXKxuK4eCE9zV/Uk4d/i1Cny77wXWHpVTL9/UKwxbo=
121124
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250929092825-4c2402451077 h1:missBxDwEfOdkHVKd6zyCyaQjSObw9Ge1O4A7WU5EuM=

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16053,10 +16053,14 @@ spec:
1605316053
type: string
1605416054
ironicConductorImage:
1605516055
type: string
16056+
ironicGraphicalConsoleImage:
16057+
type: string
1605616058
ironicInspectorImage:
1605716059
type: string
1605816060
ironicNeutronAgentImage:
1605916061
type: string
16062+
ironicNovncImage:
16063+
type: string
1606016064
ironicPxeImage:
1606116065
type: string
1606216066
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: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,22 @@ 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
30+
- patch: '[{"op": "replace", "path": "/spec/template/spec/containers/1/env/0", "value":
31+
{"name": "OPENSTACK_RELEASE_VERSION", "value": "0.4.0-1759693849"}}]'
32+
target:
33+
kind: Deployment
34+
name: openstack-operator-controller-operator
35+
namespace: system

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/google/uuid v1.6.0
1010
github.com/iancoleman/strcase v0.3.0
1111
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7
12-
github.com/onsi/ginkgo/v2 v2.25.3
12+
github.com/onsi/ginkgo/v2 v2.26.0
1313
github.com/onsi/gomega v1.38.2
1414
github.com/openshift/api v3.9.0+incompatible
1515
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20251002143431-4d83c0d3d84f
@@ -19,7 +19,7 @@ require (
1919
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20251002164852-4db724e1298c
2020
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20251002161904-e6aac32a6d8a
2121
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20251002120642-c2d58c6fc03e
22-
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20251003082107-71dab701876e
22+
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20251004062824-dc30ef1bac12
2323
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20251002084815-17073bbaef03
2424
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20250929092825-4c2402451077
2525
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20250929092825-4c2402451077

0 commit comments

Comments
 (0)