Skip to content

Commit 06eb0b3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #635 from openstack-k8s-operators/renovate/openstack-k8s-operators
Update openstack-k8s-operators
2 parents 37e7064 + b153125 commit 06eb0b3

File tree

6 files changed

+459
-129
lines changed

6 files changed

+459
-129
lines changed

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

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4568,6 +4568,24 @@ spec:
45684568
type: string
45694569
storageRequest:
45704570
type: string
4571+
tls:
4572+
properties:
4573+
api:
4574+
properties:
4575+
internal:
4576+
properties:
4577+
secretName:
4578+
type: string
4579+
type: object
4580+
public:
4581+
properties:
4582+
secretName:
4583+
type: string
4584+
type: object
4585+
type: object
4586+
caBundleSecretName:
4587+
type: string
4588+
type: object
45714589
type:
45724590
default: split
45734591
enum:
@@ -4988,6 +5006,24 @@ spec:
49885006
x-kubernetes-int-or-string: true
49895007
type: object
49905008
type: object
5009+
tls:
5010+
properties:
5011+
api:
5012+
properties:
5013+
internal:
5014+
properties:
5015+
secretName:
5016+
type: string
5017+
type: object
5018+
public:
5019+
properties:
5020+
secretName:
5021+
type: string
5022+
type: object
5023+
type: object
5024+
caBundleSecretName:
5025+
type: string
5026+
type: object
49915027
required:
49925028
- containerImage
49935029
type: object
@@ -5099,6 +5135,24 @@ spec:
50995135
x-kubernetes-int-or-string: true
51005136
type: object
51015137
type: object
5138+
tls:
5139+
properties:
5140+
api:
5141+
properties:
5142+
internal:
5143+
properties:
5144+
secretName:
5145+
type: string
5146+
type: object
5147+
public:
5148+
properties:
5149+
secretName:
5150+
type: string
5151+
type: object
5152+
type: object
5153+
caBundleSecretName:
5154+
type: string
5155+
type: object
51025156
required:
51035157
- containerImage
51045158
type: object
@@ -6432,6 +6486,24 @@ spec:
64326486
type: object
64336487
secret:
64346488
type: string
6489+
tls:
6490+
properties:
6491+
api:
6492+
properties:
6493+
internal:
6494+
properties:
6495+
secretName:
6496+
type: string
6497+
type: object
6498+
public:
6499+
properties:
6500+
secretName:
6501+
type: string
6502+
type: object
6503+
type: object
6504+
caBundleSecretName:
6505+
type: string
6506+
type: object
64356507
trustFlushArgs:
64366508
default: ""
64376509
type: string
@@ -6445,6 +6517,7 @@ spec:
64456517
- containerImage
64466518
- databaseInstance
64476519
- memcachedInstance
6520+
- rabbitMqClusterName
64486521
- secret
64496522
type: object
64506523
type: object
@@ -9016,6 +9089,24 @@ spec:
90169089
x-kubernetes-int-or-string: true
90179090
type: object
90189091
type: object
9092+
tls:
9093+
properties:
9094+
api:
9095+
properties:
9096+
internal:
9097+
properties:
9098+
secretName:
9099+
type: string
9100+
type: object
9101+
public:
9102+
properties:
9103+
secretName:
9104+
type: string
9105+
type: object
9106+
type: object
9107+
caBundleSecretName:
9108+
type: string
9109+
type: object
90199110
type: object
90209111
cellTemplates:
90219112
additionalProperties:
@@ -9190,6 +9281,13 @@ spec:
91909281
x-kubernetes-int-or-string: true
91919282
type: object
91929283
type: object
9284+
tls:
9285+
properties:
9286+
caBundleSecretName:
9287+
type: string
9288+
secretName:
9289+
type: string
9290+
type: object
91939291
type: object
91949292
noVNCProxyServiceTemplate:
91959293
properties:
@@ -9297,6 +9395,13 @@ spec:
92979395
x-kubernetes-int-or-string: true
92989396
type: object
92999397
type: object
9398+
tls:
9399+
properties:
9400+
caBundleSecretName:
9401+
type: string
9402+
secretName:
9403+
type: string
9404+
type: object
93009405
type: object
93019406
nodeSelector:
93029407
additionalProperties:
@@ -9510,6 +9615,13 @@ spec:
95109615
x-kubernetes-int-or-string: true
95119616
type: object
95129617
type: object
9618+
tls:
9619+
properties:
9620+
caBundleSecretName:
9621+
type: string
9622+
secretName:
9623+
type: string
9624+
type: object
95139625
type: object
95149626
nodeSelector:
95159627
additionalProperties:
@@ -10756,6 +10868,24 @@ spec:
1075610868
serviceUser:
1075710869
default: placement
1075810870
type: string
10871+
tls:
10872+
properties:
10873+
api:
10874+
properties:
10875+
internal:
10876+
properties:
10877+
secretName:
10878+
type: string
10879+
type: object
10880+
public:
10881+
properties:
10882+
secretName:
10883+
type: string
10884+
type: object
10885+
type: object
10886+
caBundleSecretName:
10887+
type: string
10888+
type: object
1075910889
required:
1076010890
- containerImage
1076110891
- databaseInstance
@@ -15295,6 +15425,41 @@ spec:
1529515425
- secret
1529615426
- sgCoreImage
1529715427
type: object
15428+
logging:
15429+
properties:
15430+
cloNamespace:
15431+
default: openshift-logging
15432+
type: string
15433+
enabled:
15434+
default: true
15435+
type: boolean
15436+
ipaddr:
15437+
type: string
15438+
network:
15439+
type: string
15440+
port:
15441+
default: 10514
15442+
format: int32
15443+
type: integer
15444+
rsyslogQueueSize:
15445+
default: 10000
15446+
format: int32
15447+
type: integer
15448+
rsyslogQueueType:
15449+
default: linkedList
15450+
type: string
15451+
rsyslogRetries:
15452+
default: 100
15453+
format: int32
15454+
type: integer
15455+
targetPort:
15456+
default: 10514
15457+
type: integer
15458+
required:
15459+
- ipaddr
15460+
- network
15461+
- rsyslogQueueType
15462+
type: object
1529815463
metricStorage:
1529915464
properties:
1530015465
customMonitoringStack:

‎apis/go.mod‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ go 1.19
55
require (
66
github.com/onsi/ginkgo/v2 v2.14.0
77
github.com/onsi/gomega v1.30.0
8-
github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240116213344-de338962b133
9-
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240115132912-653e1ff5359a
8+
github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240122184042-2a7dc4365ae4
9+
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240125234101-022d50b2f09a
1010
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240104144436-858a0383741c
11-
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240114144110-9b32acbd4b90
12-
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240110150403-dbf022bd8ae6
11+
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240125205602-5078ec145f59
12+
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240126104104-98b57e66f7b5
1313
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240107213124-f2df1172f89e
14-
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240104150635-c4ffc51e0752
14+
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240125112246-15881e3c5305
1515
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240112015156-0cd36db16810
16-
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240104144437-5355d932c316
17-
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240115104107-5b2be2642dcf
18-
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240116121536-4104bb44912a
19-
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240116111504-6fb96fd3a8bc
20-
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240116204130-66ba6ed891a1
21-
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240115202843-8f204945b887
16+
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240125201204-a18a1e700034
17+
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240124141114-55d029e4658b
18+
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240125214002-8d4df0d9e4d6
19+
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240125183550-331c633c453c
20+
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240122135031-be5f0da8fa93
21+
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240126131503-ccdb40976d65
2222
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240116133406-c220c5e98b5e
23-
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240116065342-bd7f402c26c3
24-
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240116173715-b3cb986c5e4f
25-
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240115090752-77a04df58ad6
26-
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240116153046-688452fbf493
23+
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240125084018-043c1fc15b4f
24+
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240125124919-72883dc08303
25+
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240125135518-3bd566f845a6
26+
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240125213204-be84db57f62f
2727
github.com/rabbitmq/cluster-operator/v2 v2.5.0
2828
k8s.io/apimachinery v0.27.7
2929
sigs.k8s.io/controller-runtime v0.15.1
@@ -37,7 +37,7 @@ require (
3737
github.com/rhobs/observability-operator v0.0.20 // indirect
3838
go.uber.org/multierr v1.11.0 // indirect
3939
go.uber.org/zap v1.26.0 // indirect
40-
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
40+
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
4141
golang.org/x/tools v0.17.0 // indirect
4242
)
4343

@@ -58,7 +58,7 @@ require (
5858
github.com/google/gnostic v0.6.9 // indirect
5959
github.com/google/go-cmp v0.6.0 // indirect
6060
github.com/google/gofuzz v1.2.0 // indirect
61-
github.com/google/uuid v1.5.0 // indirect
61+
github.com/google/uuid v1.6.0 // indirect
6262
github.com/gophercloud/gophercloud v1.8.0 // indirect
6363
github.com/imdario/mergo v0.3.16 // indirect
6464
github.com/josharian/intern v1.0.0 // indirect
@@ -69,8 +69,8 @@ require (
6969
github.com/modern-go/reflect2 v1.0.2 // indirect
7070
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7171
github.com/openshift/api v3.9.0+incompatible // indirect
72-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240115104107-5b2be2642dcf //indirect
73-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240115104107-5b2be2642dcf
72+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240124141114-55d029e4658b //indirect
73+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240124141114-55d029e4658b
7474
github.com/pkg/errors v0.9.1 // indirect
7575
github.com/prometheus/client_golang v1.16.0 // indirect
7676
github.com/prometheus/client_model v0.4.0 // indirect

0 commit comments

Comments
 (0)