Skip to content

Commit 5ca45db

Browse files
Merge pull request #688 from openstack-k8s-operators/renovate/openstack-k8s-operators
Update openstack-k8s-operators
2 parents cd8ff26 + 8cf6d5e commit 5ca45db

File tree

6 files changed

+333
-99
lines changed

6 files changed

+333
-99
lines changed

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4663,6 +4663,9 @@ spec:
46634663
keystoneEndpoint:
46644664
default: ""
46654665
type: string
4666+
memcachedInstance:
4667+
default: memcached
4668+
type: string
46664669
nodeSelector:
46674670
additionalProperties:
46684671
type: string
@@ -4717,6 +4720,7 @@ spec:
47174720
- glanceAPIs
47184721
- imageCache
47194722
- keystoneEndpoint
4723+
- memcachedInstance
47204724
- secret
47214725
- storageRequest
47224726
type: object
@@ -9265,6 +9269,20 @@ spec:
92659269
type: object
92669270
type: object
92679271
type: object
9272+
dbPurge:
9273+
properties:
9274+
archiveAge:
9275+
default: 30
9276+
minimum: 1
9277+
type: integer
9278+
purgeAge:
9279+
default: 90
9280+
minimum: 1
9281+
type: integer
9282+
schedule:
9283+
default: 0 0 * * *
9284+
type: string
9285+
type: object
92689286
hasAPIAccess:
92699287
type: boolean
92709288
memcachedInstance:
@@ -9899,6 +9917,28 @@ spec:
98999917
type: boolean
99009918
template:
99019919
properties:
9920+
amphoraCustomFlavors:
9921+
items:
9922+
properties:
9923+
RAM:
9924+
type: integer
9925+
RxTxFactor:
9926+
type: string
9927+
VCPUs:
9928+
type: integer
9929+
description:
9930+
type: string
9931+
disk:
9932+
type: integer
9933+
name:
9934+
type: string
9935+
required:
9936+
- RAM
9937+
- VCPUs
9938+
- disk
9939+
- name
9940+
type: object
9941+
type: array
99029942
certsSecret:
99039943
default: octavia-certs-secret
99049944
type: string
@@ -10076,6 +10116,28 @@ spec:
1007610116
type: object
1007710117
octaviaHealthManager:
1007810118
properties:
10119+
amphoraCustomFlavors:
10120+
items:
10121+
properties:
10122+
RAM:
10123+
type: integer
10124+
RxTxFactor:
10125+
type: string
10126+
VCPUs:
10127+
type: integer
10128+
description:
10129+
type: string
10130+
disk:
10131+
type: integer
10132+
name:
10133+
type: string
10134+
required:
10135+
- RAM
10136+
- VCPUs
10137+
- disk
10138+
- name
10139+
type: object
10140+
type: array
1007910141
certsPassphraseSecret:
1008010142
default: octavia-ca-passphrase
1008110143
type: string
@@ -10186,6 +10248,28 @@ spec:
1018610248
type: object
1018710249
octaviaHousekeeping:
1018810250
properties:
10251+
amphoraCustomFlavors:
10252+
items:
10253+
properties:
10254+
RAM:
10255+
type: integer
10256+
RxTxFactor:
10257+
type: string
10258+
VCPUs:
10259+
type: integer
10260+
description:
10261+
type: string
10262+
disk:
10263+
type: integer
10264+
name:
10265+
type: string
10266+
required:
10267+
- RAM
10268+
- VCPUs
10269+
- disk
10270+
- name
10271+
type: object
10272+
type: array
1018910273
certsPassphraseSecret:
1019010274
default: octavia-ca-passphrase
1019110275
type: string
@@ -10296,6 +10380,28 @@ spec:
1029610380
type: object
1029710381
octaviaWorker:
1029810382
properties:
10383+
amphoraCustomFlavors:
10384+
items:
10385+
properties:
10386+
RAM:
10387+
type: integer
10388+
RxTxFactor:
10389+
type: string
10390+
VCPUs:
10391+
type: integer
10392+
description:
10393+
type: string
10394+
disk:
10395+
type: integer
10396+
name:
10397+
type: string
10398+
required:
10399+
- RAM
10400+
- VCPUs
10401+
- disk
10402+
- name
10403+
type: object
10404+
type: array
1029910405
certsPassphraseSecret:
1030010406
default: octavia-ca-passphrase
1030110407
type: string
@@ -15346,6 +15452,9 @@ spec:
1534615452
additionalProperties:
1534715453
type: string
1534815454
type: object
15455+
encryptionEnabled:
15456+
default: false
15457+
type: boolean
1534915458
memcachedServers:
1535015459
default: ""
1535115460
type: string
@@ -15474,6 +15583,11 @@ spec:
1547415583
swiftConfSecret:
1547515584
default: swift-conf
1547615585
type: string
15586+
tls:
15587+
properties:
15588+
caBundleSecretName:
15589+
type: string
15590+
type: object
1547715591
required:
1547815592
- containerImage
1547915593
- minPartHours

apis/go.mod

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ require (
66
github.com/onsi/ginkgo/v2 v2.15.0
77
github.com/onsi/gomega v1.31.1
88
github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240226165142-cb4e05f187dc
9-
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240226142027-fd2c289db7cb
9+
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240301180431-f14a9a6de626
1010
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240227172900-6b5267549089
11-
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240227173143-0edb7845d02d
12-
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240227102739-4385489fe06b
11+
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240228075535-ca3432cb65c2
12+
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240229065949-dc7919e45441
1313
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240227193241-8c506107e152
1414
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240221083751-49edc0df8a12
15-
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240227192424-196de12b349c
15+
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240229174131-28e3aee56d91
1616
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240226160457-b1b853eb4600
17-
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240227142955-7f3f84347d80
18-
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240225212614-b19b1bc5e38f
17+
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240229121803-169ced56d56e
18+
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240228192101-00bb019bd68b
1919
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240222094307-76fef735f093
20-
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240227164744-a5d059fe3866
21-
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240227141648-d0fc19939cd0
22-
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240226131611-9e1c9e20aeec
20+
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240301125628-fe5c58abe3d0
21+
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240229155106-17a899255ec6
22+
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240229160800-aa54e85bdfb3
2323
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240227150317-d42793e452c2
24-
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240226114810-c3d2988d777c
25-
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240227123655-fb2f23c4ad89
26-
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240227142952-0d4f1ece1c02
24+
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240229134606-d2a5a5abde9d
25+
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240301170116-13941759ec79
26+
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240301135657-444ba309cbb5
2727
github.com/rabbitmq/cluster-operator/v2 v2.5.0
2828
k8s.io/apimachinery v0.29.0
2929
sigs.k8s.io/controller-runtime v0.16.5
@@ -38,6 +38,7 @@ require (
3838
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3939
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3 // indirect
4040
github.com/rhobs/observability-operator v0.0.20 // indirect
41+
github.com/robfig/cron/v3 v3.0.1 // indirect
4142
github.com/rogpeppe/go-internal v1.12.0 // indirect
4243
go.uber.org/multierr v1.11.0 // indirect
4344
go.uber.org/zap v1.27.0 // indirect
@@ -71,8 +72,8 @@ require (
7172
github.com/modern-go/reflect2 v1.0.2 // indirect
7273
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7374
github.com/openshift/api v3.9.0+incompatible // indirect
74-
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240227142955-7f3f84347d80 //indirect
75-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240227142955-7f3f84347d80
75+
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240229121803-169ced56d56e //indirect
76+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240229121803-169ced56d56e
7677
github.com/pkg/errors v0.9.1 // indirect
7778
github.com/prometheus/client_golang v1.18.0 // indirect
7879
github.com/prometheus/client_model v0.5.0 // indirect

0 commit comments

Comments
 (0)