Skip to content

Commit d74b21e

Browse files
dprincedprince
committed
image fixes
1 parent 431aeed commit d74b21e

14 files changed

Lines changed: 64 additions & 34 deletions

‎api/bases/client.openstack.org_openstackclients.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,16 @@ spec:
186186
When enabled, the rhos-mcps server runs alongside the openstackclient
187187
container and is exposed via a k8s Service.
188188
properties:
189-
containerImage:
190-
description: ContainerImage for the rhos-mcps MCP server container.
191-
type: string
192189
enabled:
193190
default: false
194191
description: Enabled controls whether the MCP server sidecar is
195192
added to the pod.
196193
type: boolean
197-
required:
198-
- containerImage
199194
type: object
195+
mcpContainerImage:
196+
description: MCPContainerImage for the MCP server sidecar container
197+
(set via OpenStackVersion)
198+
type: string
200199
nodeSelector:
201200
additionalProperties:
202201
type: string

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12984,13 +12984,9 @@ spec:
1298412984
x-kubernetes-list-type: map
1298512985
mcp:
1298612986
properties:
12987-
containerImage:
12988-
type: string
1298912987
enabled:
1299012988
default: false
1299112989
type: boolean
12992-
required:
12993-
- containerImage
1299412990
type: object
1299512991
nodeSelector:
1299612992
additionalProperties:
@@ -18340,6 +18336,8 @@ spec:
1834018336
type: string
1834118337
openstackClientImage:
1834218338
type: string
18339+
openstackMcpImage:
18340+
type: string
1834318341
openstackNetworkExporterImage:
1834418342
type: string
1834518343
osContainerImage:

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ spec:
199199
type: string
200200
openstackClientImage:
201201
type: string
202+
openstackMcpImage:
203+
type: string
202204
openstackNetworkExporterImage:
203205
type: string
204206
osContainerImage:
@@ -439,6 +441,8 @@ spec:
439441
type: string
440442
openstackClientImage:
441443
type: string
444+
openstackMcpImage:
445+
type: string
442446
openstackNetworkExporterImage:
443447
type: string
444448
osContainerImage:
@@ -643,6 +647,8 @@ spec:
643647
type: string
644648
openstackClientImage:
645649
type: string
650+
openstackMcpImage:
651+
type: string
646652
openstackNetworkExporterImage:
647653
type: string
648654
osContainerImage:
@@ -859,6 +865,8 @@ spec:
859865
type: string
860866
openstackClientImage:
861867
type: string
868+
openstackMcpImage:
869+
type: string
862870
openstackNetworkExporterImage:
863871
type: string
864872
osContainerImage:

‎api/client/v1beta1/openstackclient_types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ type OpenStackClientSpec struct {
3535
// +kubebuilder:validation:Required
3636
// ContainerImage for the OpenstackClient container (will be set to environmental default if empty)
3737
ContainerImage string `json:"containerImage"`
38+
39+
// +kubebuilder:validation:Optional
40+
// MCPContainerImage for the MCP server sidecar container (set via OpenStackVersion)
41+
MCPContainerImage string `json:"mcpContainerImage,omitempty"`
3842
}
3943

4044
// MCPConfig defines optional MCP server sidecar configuration
@@ -43,10 +47,6 @@ type MCPConfig struct {
4347
// +kubebuilder:validation:Optional
4448
// +kubebuilder:default=false
4549
Enabled bool `json:"enabled"`
46-
47-
// ContainerImage for the rhos-mcps MCP server container.
48-
// +kubebuilder:validation:Required
49-
ContainerImage string `json:"containerImage"`
5050
}
5151

5252
// OpenStackClientSpecCore defines the desired state of OpenStackClient

‎api/core/v1beta1/openstackversion_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type ContainerTemplate struct {
152152
OctaviaWorkerImage *string `json:"octaviaWorkerImage,omitempty"`
153153
OctaviaRsyslogImage *string `json:"octaviaRsyslogImage,omitempty"`
154154
OpenstackClientImage *string `json:"openstackClientImage,omitempty"`
155+
OpenstackMcpImage *string `json:"openstackMcpImage,omitempty"`
155156
OsContainerImage *string `json:"osContainerImage,omitempty"` //fixme wire this in?
156157
OvnControllerImage *string `json:"ovnControllerImage,omitempty"`
157158
OvnControllerOvsImage *string `json:"ovnControllerOvsImage,omitempty"`

‎api/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 5 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: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -781,17 +781,16 @@ spec:
781781
When enabled, the rhos-mcps server runs alongside the openstackclient
782782
container and is exposed via a k8s Service.
783783
properties:
784-
containerImage:
785-
description: ContainerImage for the rhos-mcps MCP server container.
786-
type: string
787784
enabled:
788785
default: false
789786
description: Enabled controls whether the MCP server sidecar is
790787
added to the pod.
791788
type: boolean
792-
required:
793-
- containerImage
794789
type: object
790+
mcpContainerImage:
791+
description: MCPContainerImage for the MCP server sidecar container
792+
(set via OpenStackVersion)
793+
type: string
795794
nodeSelector:
796795
additionalProperties:
797796
type: string
@@ -13862,13 +13861,9 @@ spec:
1386213861
x-kubernetes-list-type: map
1386313862
mcp:
1386413863
properties:
13865-
containerImage:
13866-
type: string
1386713864
enabled:
1386813865
default: false
1386913866
type: boolean
13870-
required:
13871-
- containerImage
1387213867
type: object
1387313868
nodeSelector:
1387413869
additionalProperties:
@@ -19218,6 +19213,8 @@ spec:
1921819213
type: string
1921919214
openstackClientImage:
1922019215
type: string
19216+
openstackMcpImage:
19217+
type: string
1922119218
openstackNetworkExporterImage:
1922219219
type: string
1922319220
osContainerImage:
@@ -22137,6 +22134,8 @@ spec:
2213722134
type: string
2213822135
openstackClientImage:
2213922136
type: string
22137+
openstackMcpImage:
22138+
type: string
2214022139
openstackNetworkExporterImage:
2214122140
type: string
2214222141
osContainerImage:
@@ -22377,6 +22376,8 @@ spec:
2237722376
type: string
2237822377
openstackClientImage:
2237922378
type: string
22379+
openstackMcpImage:
22380+
type: string
2238022381
openstackNetworkExporterImage:
2238122382
type: string
2238222383
osContainerImage:
@@ -22581,6 +22582,8 @@ spec:
2258122582
type: string
2258222583
openstackClientImage:
2258322584
type: string
22585+
openstackMcpImage:
22586+
type: string
2258422587
openstackNetworkExporterImage:
2258522588
type: string
2258622589
osContainerImage:
@@ -22797,6 +22800,8 @@ spec:
2279722800
type: string
2279822801
openstackClientImage:
2279922802
type: string
22803+
openstackMcpImage:
22804+
type: string
2280022805
openstackNetworkExporterImage:
2280122806
type: string
2280222807
osContainerImage:

‎config/crd/bases/client.openstack.org_openstackclients.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,16 @@ spec:
186186
When enabled, the rhos-mcps server runs alongside the openstackclient
187187
container and is exposed via a k8s Service.
188188
properties:
189-
containerImage:
190-
description: ContainerImage for the rhos-mcps MCP server container.
191-
type: string
192189
enabled:
193190
default: false
194191
description: Enabled controls whether the MCP server sidecar is
195192
added to the pod.
196193
type: boolean
197-
required:
198-
- containerImage
199194
type: object
195+
mcpContainerImage:
196+
description: MCPContainerImage for the MCP server sidecar container
197+
(set via OpenStackVersion)
198+
type: string
200199
nodeSelector:
201200
additionalProperties:
202201
type: string

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12984,13 +12984,9 @@ spec:
1298412984
x-kubernetes-list-type: map
1298512985
mcp:
1298612986
properties:
12987-
containerImage:
12988-
type: string
1298912987
enabled:
1299012988
default: false
1299112989
type: boolean
12992-
required:
12993-
- containerImage
1299412990
type: object
1299512991
nodeSelector:
1299612992
additionalProperties:
@@ -18340,6 +18336,8 @@ spec:
1834018336
type: string
1834118337
openstackClientImage:
1834218338
type: string
18339+
openstackMcpImage:
18340+
type: string
1834318341
openstackNetworkExporterImage:
1834418342
type: string
1834518343
osContainerImage:

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ spec:
199199
type: string
200200
openstackClientImage:
201201
type: string
202+
openstackMcpImage:
203+
type: string
202204
openstackNetworkExporterImage:
203205
type: string
204206
osContainerImage:
@@ -439,6 +441,8 @@ spec:
439441
type: string
440442
openstackClientImage:
441443
type: string
444+
openstackMcpImage:
445+
type: string
442446
openstackNetworkExporterImage:
443447
type: string
444448
osContainerImage:
@@ -643,6 +647,8 @@ spec:
643647
type: string
644648
openstackClientImage:
645649
type: string
650+
openstackMcpImage:
651+
type: string
646652
openstackNetworkExporterImage:
647653
type: string
648654
osContainerImage:
@@ -859,6 +865,8 @@ spec:
859865
type: string
860866
openstackClientImage:
861867
type: string
868+
openstackMcpImage:
869+
type: string
862870
openstackNetworkExporterImage:
863871
type: string
864872
osContainerImage:

0 commit comments

Comments
 (0)