Skip to content

Commit 0ae2dae

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 8fb6d05 commit 0ae2dae

File tree

13 files changed

+286
-175
lines changed

13 files changed

+286
-175
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6586,6 +6586,13 @@ spec:
65866586
additionalProperties:
65876587
type: string
65886588
type: object
6589+
graphicalConsoles:
6590+
default: Disabled
6591+
enum:
6592+
- Enabled
6593+
- Disabled
6594+
- ""
6595+
type: string
65896596
ironicAPI:
65906597
properties:
65916598
customServiceConfig:
@@ -16034,10 +16041,14 @@ spec:
1603416041
type: string
1603516042
ironicConductorImage:
1603616043
type: string
16044+
ironicGraphicalConsoleImage:
16045+
type: string
1603716046
ironicInspectorImage:
1603816047
type: string
1603916048
ironicNeutronAgentImage:
1604016049
type: string
16050+
ironicNovncImage:
16051+
type: string
1604116052
ironicPxeImage:
1604216053
type: string
1604316054
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: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
module github.com/openstack-k8s-operators/openstack-operator/apis
22

3-
go 1.24
3+
go 1.24.4
4+
5+
toolchain go1.24.7
46

57
require (
68
github.com/cert-manager/cert-manager v1.14.7
79
github.com/go-playground/validator/v10 v10.25.0
8-
github.com/onsi/ginkgo/v2 v2.20.1
9-
github.com/onsi/gomega v1.34.1
10+
github.com/onsi/ginkgo/v2 v2.26.0
11+
github.com/onsi/gomega v1.38.2
1012
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250916162815-94a54170a2be
1113
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250916151837-4aab51f61506
1214
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250916093535-a95d6d012ab5
1315
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250913143437-ca03bf1e106a
1416
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250916093004-20a0505e2327
1517
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250911092040-f829125f6046
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250919143843-b81500a16049
17-
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250915220807-7ac28d765257
18+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20251002120642-c2d58c6fc03e
19+
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20251004062824-dc30ef1bac12
1820
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250916093250-82a76386143d
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
21+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250929092825-4c2402451077
2022
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250922082314-c83d83092a04
2123
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250919144954-99877452c35b
2224
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250919091623-97dfb39624e3
@@ -33,84 +35,85 @@ require (
3335
github.com/rhobs/observability-operator v0.3.1 // indirect
3436
go.uber.org/multierr v1.11.0 // indirect
3537
go.uber.org/zap v1.27.0 // indirect
36-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
37-
golang.org/x/tools v0.24.0 // indirect
38-
k8s.io/api v0.31.12
39-
k8s.io/apimachinery v0.31.12
40-
k8s.io/client-go v0.31.12
38+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
39+
golang.org/x/tools v0.36.0 // indirect
40+
k8s.io/api v0.33.2
41+
k8s.io/apimachinery v0.33.2
42+
k8s.io/client-go v0.33.2
4143
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
4244
sigs.k8s.io/controller-runtime v0.19.7
4345
)
4446

4547
require (
48+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
4649
github.com/beorn7/perks v1.0.1 // indirect
4750
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4851
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
49-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
50-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
51-
github.com/fsnotify/fsnotify v1.7.0 // indirect
52-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
52+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
53+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
54+
github.com/fsnotify/fsnotify v1.9.0 // indirect
55+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
5356
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
5457
github.com/go-logr/logr v1.4.3 // indirect
5558
github.com/go-logr/zapr v1.3.0 // indirect
56-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
59+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
5760
github.com/go-openapi/jsonreference v0.21.0 // indirect
58-
github.com/go-openapi/swag v0.23.0 // indirect
61+
github.com/go-openapi/swag v0.23.1 // indirect
5962
github.com/go-playground/locales v0.14.1 // indirect
6063
github.com/go-playground/universal-translator v0.18.1 // indirect
6164
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6265
github.com/gogo/protobuf v1.3.2 // indirect
63-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
64-
github.com/golang/protobuf v1.5.4 // indirect
6566
github.com/google/gnostic-models v0.7.0 // indirect
6667
github.com/google/go-cmp v0.7.0 // indirect
67-
github.com/google/gofuzz v1.2.0 // indirect
68-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
68+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
6969
github.com/google/uuid v1.6.0 // indirect
7070
github.com/gophercloud/gophercloud v1.14.1 // indirect
71-
github.com/imdario/mergo v0.3.16 // indirect
7271
github.com/josharian/intern v1.0.0 // indirect
7372
github.com/json-iterator/go v1.1.12 // indirect
7473
github.com/leodido/go-urn v1.4.0 // indirect
75-
github.com/mailru/easyjson v0.7.7 // indirect
74+
github.com/mailru/easyjson v0.9.0 // indirect
7675
github.com/metal3-io/baremetal-operator/apis v0.6.3 // indirect
7776
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
7877
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
79-
github.com/modern-go/reflect2 v1.0.2 // indirect
78+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8079
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8180
github.com/openshift/api v3.9.0+incompatible // indirect
8281
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250823121217-7e1cd2e3dd03 // indirect
8382
github.com/pkg/errors v0.9.1 // indirect
84-
github.com/prometheus/client_golang v1.19.1 // indirect
85-
github.com/prometheus/client_model v0.6.1 // indirect
86-
github.com/prometheus/common v0.55.0 // indirect
87-
github.com/prometheus/procfs v0.15.1 // indirect
88-
github.com/rabbitmq/cluster-operator/v2 v2.9.0 // indirect
83+
github.com/prometheus/client_golang v1.22.0 // indirect
84+
github.com/prometheus/client_model v0.6.2 // indirect
85+
github.com/prometheus/common v0.65.0 // indirect
86+
github.com/prometheus/procfs v0.16.1 // indirect
87+
github.com/rabbitmq/cluster-operator/v2 v2.16.0 // indirect
8988
github.com/robfig/cron/v3 v3.0.1 // indirect
90-
github.com/spf13/pflag v1.0.6 // indirect
89+
github.com/spf13/pflag v1.0.7 // indirect
9190
github.com/stretchr/testify v1.11.1 // indirect
9291
github.com/x448/float16 v0.8.4 // indirect
92+
go.uber.org/automaxprocs v1.6.0 // indirect
9393
go.yaml.in/yaml/v2 v2.4.2 // indirect
94-
go.yaml.in/yaml/v3 v3.0.3 // indirect
95-
golang.org/x/crypto v0.33.0 // indirect
96-
golang.org/x/net v0.34.0 // indirect
97-
golang.org/x/oauth2 v0.21.0 // indirect
98-
golang.org/x/sys v0.30.0 // indirect
99-
golang.org/x/term v0.29.0 // indirect
100-
golang.org/x/text v0.22.0 // indirect
101-
golang.org/x/time v0.5.0 // indirect
102-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
103-
google.golang.org/protobuf v1.35.1 // indirect
94+
go.yaml.in/yaml/v3 v3.0.4 // indirect
95+
golang.org/x/crypto v0.41.0 // indirect
96+
golang.org/x/mod v0.27.0 // indirect
97+
golang.org/x/net v0.43.0 // indirect
98+
golang.org/x/oauth2 v0.30.0 // indirect
99+
golang.org/x/sync v0.16.0 // indirect
100+
golang.org/x/sys v0.35.0 // indirect
101+
golang.org/x/term v0.34.0 // indirect
102+
golang.org/x/text v0.28.0 // indirect
103+
golang.org/x/time v0.12.0 // indirect
104+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
105+
google.golang.org/protobuf v1.36.7 // indirect
106+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
104107
gopkg.in/inf.v0 v0.9.1 // indirect
105108
gopkg.in/yaml.v3 v3.0.1 // indirect
106-
k8s.io/apiextensions-apiserver v0.31.12 // indirect
109+
k8s.io/apiextensions-apiserver v0.33.2 // indirect
107110
k8s.io/klog/v2 v2.130.1 // indirect
108-
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
111+
k8s.io/kube-openapi v0.0.0-20250902184714-7fc278399c7f // indirect
109112
sigs.k8s.io/gateway-api v1.0.0 // indirect
110-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
113+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
111114
sigs.k8s.io/randfill v1.0.0 // indirect
112-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
113-
sigs.k8s.io/yaml v1.4.0 // indirect
115+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
116+
sigs.k8s.io/yaml v1.6.0 // indirect
114117
)
115118

116119
// mschuppert: map to latest commit from release-4.18 tag

0 commit comments

Comments
 (0)