Skip to content

Commit

Permalink
migrate from databaseUsername to databaseAccount
Browse files Browse the repository at this point in the history
  • Loading branch information
@zzzeek @openshift-merge-bot
zzzeek authored and openshift-merge-bot[bot] committed Mar 5, 2024
1 parent 4d24b73 commit 90a97e1
Show file tree
Hide file tree
Showing 59 changed files with 1,328 additions and 742 deletions.
41 changes: 12 additions & 29 deletions api/bases/nova.openstack.org_nova.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ spec:
spec:
description: NovaSpec defines the desired state of Nova
properties:
apiDatabaseAccount:
default: nova-api
description: APIDatabaseAccount - MariaDBAccount to use when accessing
the API DB
type: string
apiDatabaseInstance:
default: openstack
description: APIDatabaseInstance is the name of the MariaDB CR to
select the DB Service instance used for the Nova API DB.
type: string
apiDatabaseUser:
default: nova_api
description: APIDatabaseUser - username to use when accessing the
API DB
type: string
apiMessageBusInstance:
default: rabbitmq
description: APIMessageBusInstance is the name of the RabbitMqCluster
Expand Down Expand Up @@ -361,16 +361,16 @@ spec:
description: NovaCellTemplate defines the input parameters specified
by the user to create a NovaCell via higher level CRDs.
properties:
cellDatabaseAccount:
description: CellDatabaseAccount - MariaDBAccount to use when
accessing the give cell DB
type: string
cellDatabaseInstance:
default: openstack
description: CellDatabaseInstance is the name of the MariaDB
CR to select the DB Service instance used as the DB of this
cell.
type: string
cellDatabaseUser:
description: CellDatabaseUser - username to use when accessing
the give cell DB
type: string
cellMessageBusInstance:
default: rabbitmq
description: CellMessageBusInstance is the name of the RabbitMqCluster
Expand Down Expand Up @@ -1222,29 +1222,17 @@ spec:
Key from map is arbitrary name for the compute with a limit
of 20 characters.'
type: object
passwordSelectors:
default:
database: NovaCell0DatabasePassword
description: PasswordSelectors - Selectors to identify the DB
passwords from the Secret
properties:
database:
default: NovaCell0DatabasePassword
description: CellDatabase - the name of the field to get
the Cell DB password from the Secret
type: string
type: object
required:
- cellDatabaseUser
- cellDatabaseAccount
- hasAPIAccess
type: object
default:
cell0:
cellDatabaseUser: nova_cell0
cellDatabaseAccount: nova-cell0
hasAPIAccess: true
cell1:
cellDatabaseAccount: nova-cell1
cellDatabaseInstance: openstack-cell1
cellDatabaseUser: nova_cell1
cellMessageBusInstance: rabbitmq-cell1
hasAPIAccess: true
description: Cells is a mapping of cell names to NovaCellTemplate
Expand Down Expand Up @@ -1564,11 +1552,6 @@ spec:
description: PasswordSelectors - Selectors to identify the DB and
ServiceUser passwords from the Secret
properties:
apiDatabase:
default: NovaAPIDatabasePassword
description: APIDatabase - the name of the field to get the API
DB password from the Secret
type: string
metadataSecret:
default: MetadataSecret
description: MetadataSecret - the name of the field to get the
Expand Down
18 changes: 9 additions & 9 deletions api/bases/nova.openstack.org_novaapis.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,24 @@ spec:
spec:
description: NovaAPISpec defines the desired state of NovaAPI
properties:
apiDatabaseAccount:
default: nova-api
description: APIDatabaseAccount - MariaDBAccount to use when accessing
the API DB
type: string
apiDatabaseHostname:
description: APIDatabaseHostname - hostname to use when accessing
the API DB
type: string
apiDatabaseUser:
default: nova_api
description: APIDatabaseUser - username to use when accessing the
API DB
cell0DatabaseAccount:
default: nova-cell0
description: APIDatabaseAccount - MariaDBAccount to use when accessing
the cell0 DB
type: string
cell0DatabaseHostname:
description: APIDatabaseHostname - hostname to use when accessing
the cell0 DB
type: string
cell0DatabaseUser:
default: nova_cell0
description: APIDatabaseUser - username to use when accessing the
cell0 DB
type: string
containerImage:
description: The service specific Container Image URL (will be set
to environmental default if empty)
Expand Down
16 changes: 8 additions & 8 deletions api/bases/nova.openstack.org_novacells.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,26 @@ spec:
spec:
description: NovaCellSpec defines the desired state of NovaCell
properties:
apiDatabaseAccount:
default: nova
description: APIDatabaseAccount - MariaDBAccount to use when accessing
the API DB
type: string
apiDatabaseHostname:
description: 'APIDatabaseHostname - hostname to use when accessing
the API DB. If not provided then up-calls will be disabled. This
filed is Required for cell0. TODO(gibi): Add a webhook to validate
cell0 constraint'
type: string
apiDatabaseUser:
cellDatabaseAccount:
default: nova
description: APIDatabaseUser - username to use when accessing the
API DB
description: CellDatabaseAccount - MariaDBAccount to use when accessing
the cell DB
type: string
cellDatabaseHostname:
description: CellDatabaseHostname - hostname to use when accessing
the cell DB
type: string
cellDatabaseUser:
default: nova
description: CellDatabaseUser - username to use when accessing the
cell DB
type: string
cellName:
description: CellName is the name of the Nova Cell. The value "cell0"
has a special meaning. The "cell0" Cell cannot have compute nodes
Expand Down
16 changes: 8 additions & 8 deletions api/bases/nova.openstack.org_novaconductors.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,26 @@ spec:
spec:
description: NovaConductorSpec defines the desired state of NovaConductor
properties:
apiDatabaseAccount:
default: nova
description: APIDatabaseAccount - MariaDBAccount to use when accessing
the API DB
type: string
apiDatabaseHostname:
description: 'APIDatabaseHostname - hostname to use when accessing
the API DB. If not provided then up-calls will be disabled. This
filed is Required for cell0. TODO(gibi): Add a webhook to validate
cell0 constraint'
type: string
apiDatabaseUser:
cellDatabaseAccount:
default: nova
description: APIDatabaseUser - username to use when accessing the
API DB
description: CellDatabaseAccount - MariaDBAccount to use when accessing
the cell DB
type: string
cellDatabaseHostname:
description: 'NOTE(gibi): This should be Required, see notes in KeystoneAuthURL
CellDatabaseHostname - hostname to use when accessing the cell DB'
type: string
cellDatabaseUser:
default: nova
description: CellDatabaseUser - username to use when accessing the
cell DB
type: string
cellName:
description: CellName is the name of the Nova Cell this conductor
belongs to.
Expand Down
18 changes: 9 additions & 9 deletions api/bases/nova.openstack.org_novametadata.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,27 @@ spec:
spec:
description: NovaMetadataSpec defines the desired state of NovaMetadata
properties:
apiDatabaseAccount:
default: nova-api
description: APIDatabaseAccount - MariaDBAccount to use when accessing
the API DB
type: string
apiDatabaseHostname:
description: 'APIDatabaseHostname - hostname to use when accessing
the API DB. This filed is Required if the CellName is not provided
TODO(gibi): Add a webhook to validate the CellName constraint'
type: string
apiDatabaseUser:
default: nova_api
description: APIDatabaseUser - username to use when accessing the
API DB
cellDatabaseAccount:
default: nova
description: CellDatabaseAccount - MariaDBAccount to use when accessing
the cell DB
type: string
cellDatabaseHostname:
description: 'CellDatabaseHostname - hostname to use when accessing
the cell DB This is unused if CellName is not provided. But if it
is provided then CellDatabaseHostName is also Required. TODO(gibi):
add webhook to validate this CellName constraint'
type: string
cellDatabaseUser:
default: nova
description: CellDatabaseUser - username to use when accessing the
cell DB
type: string
cellName:
description: CellName is the name of the Nova Cell this metadata service
belongs to. If not provided then the metadata serving every cells
Expand Down
10 changes: 5 additions & 5 deletions api/bases/nova.openstack.org_novanovncproxies.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ spec:
spec:
description: NovaNoVNCProxySpec defines the desired state of NovaNoVNCProxy
properties:
cellDatabaseAccount:
default: nova
description: CellDatabaseAccount - MariaDBAccount to use when accessing
the cell DB
type: string
cellDatabaseHostname:
description: CellDatabaseHostname - hostname to use when accessing
the cell DB
type: string
cellDatabaseUser:
default: nova
description: CellDatabaseUser - username to use when accessing the
cell DB
type: string
cellName:
description: CellName is the name of the Nova Cell this novncproxy
belongs to.
Expand Down
18 changes: 9 additions & 9 deletions api/bases/nova.openstack.org_novaschedulers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,24 @@ spec:
spec:
description: NovaSchedulerSpec defines the desired state of NovaScheduler
properties:
apiDatabaseAccount:
default: nova-api
description: APIDatabaseAccount - MariaDBAccount to use when accessing
the API DB
type: string
apiDatabaseHostname:
description: APIDatabaseHostname - hostname to use when accessing
the API DB
type: string
apiDatabaseUser:
default: nova_api
description: APIDatabaseUser - username to use when accessing the
API DB
cell0DatabaseAccount:
default: nova-cell0
description: Cell0DatabaseAccount - MariaDBAccount to use when accessing
the cell0 DB
type: string
cell0DatabaseHostname:
description: Cell0DatabaseHostname - hostname to use when accessing
the cell0 DB
type: string
cell0DatabaseUser:
default: nova_cell0
description: Cell0DatabaseUser - username to use when accessing the
cell0 DB
type: string
containerImage:
description: The service specific Container Image URL (will be set
to environmental default if empty)
Expand Down
31 changes: 15 additions & 16 deletions api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/swag v0.22.9 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
Expand All @@ -33,29 +34,27 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo/v2 v2.16.0 // indirect
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
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.46.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.3 // indirect
go.uber.org/goleak v1.3.0 // indirect
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/term v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 90a97e1

Please sign in to comment.