Skip to content

Commit e22415e

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2042 from openstack-k8s-operators/openstack-dependency-bump/main
openstack-k8s-operators dependency bump branch: main
2 parents 0e9b919 + de0592e commit e22415e

35 files changed

Lines changed: 522 additions & 233 deletions

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7606,6 +7606,50 @@ spec:
76067606
namespace:
76077607
type: string
76087608
type: object
7609+
traitBasedNetworking:
7610+
properties:
7611+
config:
7612+
items:
7613+
properties:
7614+
actions:
7615+
items:
7616+
properties:
7617+
action:
7618+
type: string
7619+
filter:
7620+
type: string
7621+
max_count:
7622+
type: integer
7623+
min_count:
7624+
type: integer
7625+
type: object
7626+
type: array
7627+
x-kubernetes-list-type: atomic
7628+
name:
7629+
pattern: ^CUSTOM_
7630+
type: string
7631+
order:
7632+
type: integer
7633+
required:
7634+
- name
7635+
type: object
7636+
type: array
7637+
x-kubernetes-list-map-keys:
7638+
- name
7639+
x-kubernetes-list-type: map
7640+
state:
7641+
default: Disabled
7642+
enum:
7643+
- Enabled
7644+
- Disabled
7645+
- ""
7646+
type: string
7647+
type: object
7648+
x-kubernetes-validations:
7649+
- message: config must be provided when traitBasedNetworking
7650+
is enabled
7651+
rule: self.state != 'Enabled' || size(self.config)
7652+
> 0
76097653
required:
76107654
- storageClass
76117655
- storageRequest

‎api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,10 @@ spec:
127127
nodes to use for ctlplane network
128128
type: string
129129
deploymentSSHSecret:
130-
description: DeploymentSSHSecret - Name of secret holding the
131-
cloud-admin ssh keys
130+
description: |-
131+
DeploymentSSHSecret - Name of a secret with an "authorized_keys" data entry holding the SSH
132+
public key(s) authorized for the provisioned user (see CloudUserName). A single key or
133+
multiple newline-separated keys are both supported.
132134
type: string
133135
domainName:
134136
description: 'DomainName is the domain name that will be set on

‎api/go.mod‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ require (
77
github.com/go-playground/validator/v10 v10.30.3
88
github.com/onsi/ginkgo/v2 v2.32.1
99
github.com/onsi/gomega v1.42.1
10-
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260815073051-f0dedab3b024
11-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260815073050-c25c043ca4ae
12-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260815074930-cb3fe627beaa
13-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260815073700-5afadb4eb584
14-
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260815073700-3979681dc9f0
15-
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260815073353-f53bfe5815ef
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260811190835-054aa14112d8
17-
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260811232801-39845d6991d2
18-
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260815074929-4ac69c11afca
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260815052137-cfc51390472e
20-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260815052137-cfc51390472e
21-
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260815074006-4fae00f90510
22-
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260815095432-ee0e4a46015e
23-
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260815100037-cd2ac3283266
24-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260814001024-80a63d2d555f
25-
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260815074607-ebcbe88dc375
26-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260815053044-b1de07d3dec3
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260815075235-e695ce054c02
28-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260815093640-19216d8cebdf
29-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260813064120-95f8cb07a4a7
30-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260810142218-4d2e4f853116
10+
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260822070011-9997d23ba011
11+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260819143714-114b7c23d91d
12+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260822070327-bc820e193cf5
13+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260819143713-65990ced6a86
14+
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260822071001-e29bb0b954ed
15+
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260822072259-4c3a386dcadd
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260820165931-18e54edd62e6
17+
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260825054911-2918d9cad585
18+
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260822072640-7bd662ad0284
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260824142420-113dc64ecfd4
20+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260824142420-113dc64ecfd4
21+
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260819143353-54e418a4e480
22+
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260822071633-1e127e728e62
23+
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260822072640-756f4ac745b5
24+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260825130502-98c7a40e3312
25+
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260822215725-f4a66af57796
26+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260825085735-282fe58052d8
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260822081959-0a0ad59d7e62
28+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260824081435-4ed426fa239f
29+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260819093739-a1df4abf6fa0
30+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260825125812-d29ca608df85
3131
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 // indirect
3232
github.com/rhobs/observability-operator v1.0.0 // indirect
3333
go.uber.org/multierr v1.11.0 // indirect
@@ -85,7 +85,7 @@ require (
8585
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8686
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8787
github.com/openshift/api v3.9.0+incompatible // indirect
88-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260813160234-fdcb3ee3699d // indirect
88+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260818072803-e18950de3098 // indirect
8989
github.com/pkg/errors v0.9.1 // indirect
9090
github.com/prometheus/client_golang v1.22.0 // indirect
9191
github.com/prometheus/client_model v0.6.2 // indirect
@@ -103,7 +103,7 @@ require (
103103
golang.org/x/sync v0.22.0 // indirect
104104
golang.org/x/sys v0.47.0 // indirect
105105
golang.org/x/term v0.45.0 // indirect
106-
golang.org/x/text v0.40.0 // indirect
106+
golang.org/x/text v0.41.0 // indirect
107107
golang.org/x/time v0.15.0 // indirect
108108
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
109109
google.golang.org/protobuf v1.36.7 // indirect

0 commit comments

Comments
 (0)