Skip to content

Commit

Permalink
Merge pull request openstack-k8s-operators#485 from openstack-k8s-ope…
Browse files Browse the repository at this point in the history 
…rators/renovate/main-openstack-k8s-operators

Update openstack-k8s-operators (main)
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Sep 29, 2023
2 parents b40eccb + d210f7a commit 1433aa8
Show file tree
Hide file tree
Showing 6 changed files with 263 additions and 129 deletions.
73 changes: 70 additions & 3 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5310,6 +5310,9 @@ spec:
type: string
debug:
properties:
dbPurge:
default: false
type: boolean
dbSync:
default: false
type: boolean
Expand Down Expand Up @@ -8053,6 +8056,71 @@ spec:
additionalProperties:
type: string
type: object
novaComputeTemplates:
additionalProperties:
properties:
computeDriver:
enum:
- ironic.IronicDriver
- fake.FakeDriver
type: string
containerImage:
type: string
customServiceConfig:
type: string
defaultConfigOverwrite:
additionalProperties:
type: string
type: object
networkAttachments:
items:
type: string
type: array
nodeSelector:
additionalProperties:
type: string
type: object
replicas:
default: 1
format: int32
maximum: 32
minimum: 0
type: integer
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object
required:
- computeDriver
type: object
type: object
passwordSelectors:
default:
database: NovaCell0DatabasePassword
Expand Down Expand Up @@ -8886,6 +8954,7 @@ spec:
default: true
type: boolean
ovn-bridge:
default: br-int
type: string
ovn-encap-type:
default: geneve
Expand All @@ -8894,10 +8963,8 @@ spec:
- vxlan
type: string
system-id:
default: random
type: string
required:
- ovn-bridge
- system-id
type: object
networkAttachment:
type: string
Expand Down
38 changes: 19 additions & 19 deletions apis/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ go 1.19
require (
github.com/onsi/ginkgo/v2 v2.12.1
github.com/onsi/gomega v1.27.10
github.com/openstack-k8s-operators/cinder-operator/api v0.1.2-0.20230921082510-1b9a7de3d088
github.com/openstack-k8s-operators/glance-operator/api v0.1.2-0.20230921081203-89164087dac9
github.com/openstack-k8s-operators/heat-operator/api v0.1.1-0.20230920142821-e84784bede25
github.com/openstack-k8s-operators/horizon-operator/api v0.1.1-0.20230920143411-511d89a0e6cc
github.com/openstack-k8s-operators/infra-operator/apis v0.1.1-0.20230920125017-2c76cd203b44
github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20230926121739-27e75237b3c8
github.com/openstack-k8s-operators/keystone-operator/api v0.1.1-0.20230920085319-92ae0260bbf3
github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20230925103424-7dcb605ea0bb
github.com/openstack-k8s-operators/manila-operator/api v0.1.1-0.20230921081246-996d4e390998
github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230918111825-8999b3b2dc3c
github.com/openstack-k8s-operators/neutron-operator/api v0.1.1-0.20230920145429-537b5afebd07
github.com/openstack-k8s-operators/nova-operator/api v0.1.2-0.20230921152245-4a535c8f3e9a
github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20230926130236-dece63badbab
github.com/openstack-k8s-operators/ovn-operator/api v0.1.1-0.20230913151226-aab30786ed97
github.com/openstack-k8s-operators/placement-operator/api v0.1.1-0.20230920125340-3c99d09c7033
github.com/openstack-k8s-operators/swift-operator/api v0.1.1-0.20230920144258-a37c476a2829
github.com/openstack-k8s-operators/telemetry-operator/api v0.1.1-0.20230922102555-fe2794ad1e8c
github.com/openstack-k8s-operators/cinder-operator/api v0.1.2-0.20230927112537-42169dd3965b
github.com/openstack-k8s-operators/glance-operator/api v0.1.2-0.20230928094722-adaea00db401
github.com/openstack-k8s-operators/heat-operator/api v0.1.1-0.20230928022009-63f4c93693b8
github.com/openstack-k8s-operators/horizon-operator/api v0.1.1-0.20230927133505-e0a30ad65a01
github.com/openstack-k8s-operators/infra-operator/apis v0.1.1-0.20230927145535-98de8aa29c2e
github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20230927134553-8c5a9c47ca79
github.com/openstack-k8s-operators/keystone-operator/api v0.1.1-0.20230927105404-11cb6a68c984
github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20230927082538-4f614f333d17
github.com/openstack-k8s-operators/manila-operator/api v0.1.1-0.20230928195132-c19d2f673d7d
github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230928152002-65395552e015
github.com/openstack-k8s-operators/neutron-operator/api v0.1.1-0.20230927135156-a3209100b1f3
github.com/openstack-k8s-operators/nova-operator/api v0.1.2-0.20230928160649-87342575139b
github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20230928114327-f032acaab883
github.com/openstack-k8s-operators/ovn-operator/api v0.1.1-0.20230927181029-2b25ed78973d
github.com/openstack-k8s-operators/placement-operator/api v0.1.1-0.20230927115929-d73f6b7ba241
github.com/openstack-k8s-operators/swift-operator/api v0.1.1-0.20230928061421-52a9feee12c9
github.com/openstack-k8s-operators/telemetry-operator/api v0.1.1-0.20230927140521-cf7134b9d873
github.com/rabbitmq/cluster-operator/v2 v2.5.0
k8s.io/apimachinery v0.27.4
sigs.k8s.io/controller-runtime v0.15.1
Expand Down Expand Up @@ -65,8 +65,8 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/openshift/api v3.9.0+incompatible // indirect
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.20230919113507-d74c2f31d216 //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.1.1-0.20230919113507-d74c2f31d216
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.20230927082538-4f614f333d17 //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.1.1-0.20230927082538-4f614f333d17
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
Expand Down
Loading

0 comments on commit 1433aa8

Please sign in to comment.