Skip to content

Commit

Permalink
Merge pull request #4 from pluralsh/master
Browse files Browse the repository at this point in the history
minor fixes
  • Loading branch information
zreigz authored Oct 19, 2022
2 parents 2e1b1c9 + 65733b4 commit 039c3e6
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ generate-spec:
echo "// Code generated by make; DO NOT EDIT." > "$(DATABASE_PROTO)"
cat $(DATABASE_SPEC) | sed -n -e '/```protobuf$$/,/^```$$/ p' | sed '/^```/d' >> "$(DATABASE_PROTO)"

build-spec: generate-spec
build-spec: generate-spec ## Generate gRPC client and server code.
protoc "$(DATABASE_PROTO)" \
--go_out=. \
--go_opt=paths=source_relative \
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Database Interface API

This repository hosts the API defintion of the Custom Resource Definitions (CRD) used for the Database Interface project.
This repository hosts the API defintion of the Custom Resource Definitions (CRD) used for the Database Interface project
and gRPC API for the Database standard [gRPC specification](spec/README.md).

The provisioned unit of storage is a `Database`. The following CRDs are defined for managing the lifecycle of Databases:

- DatabaseRequest - Represents a request to provision a Database
Expand Down
2 changes: 1 addition & 1 deletion apis/database/v1alpha1/databaseaccessclass_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type DatabaseAccessClass struct {
AuthenticationType AuthenticationType `json:"authenticationType"`

// Parameters is an opaque map for passing in configuration to a driver
// for granting access to a bucket
// for granting access to the database
// +optional
Parameters map[string]string `json:"parameters,omitempty"`
}
Expand Down
2 changes: 1 addition & 1 deletion apis/database/v1alpha1/databaseclass_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type DatabaseClass struct {
DriverName string `json:"driverName"`

// Parameters is an opaque map for passing in configuration to a driver
// for creating the bucket
// for creating the database
// +optional
Parameters map[string]string `json:"parameters,omitempty"`
}
Expand Down
3 changes: 0 additions & 3 deletions apis/database/v1alpha1/databaserequest_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ type DatabaseRequestSpec struct {
// DatabaseClassName name of the DatabaseClass
DatabaseClassName string `json:"databaseClassName,omitempty"`

// Engine name
Engine string `json:"engine"`

// Name of a database object.
// If unspecified, then a new Database will be dynamically provisioned
// +optional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
additionalProperties:
type: string
description: Parameters is an opaque map for passing in configuration
to a driver for granting access to a bucket
to a driver for granting access to the database
type: object
required:
- authenticationType
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/database.plural.sh_databaseclasses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
additionalProperties:
type: string
description: Parameters is an opaque map for passing in configuration
to a driver for creating the bucket
to a driver for creating the database
type: object
required:
- driverName
Expand Down
5 changes: 0 additions & 5 deletions config/crd/bases/database.plural.sh_databaserequests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,10 @@ spec:
databaseClassName:
description: DatabaseClassName name of the DatabaseClass
type: string
engine:
description: Engine name
type: string
existingBucketName:
description: Name of a database object. If unspecified, then a new
Database will be dynamically provisioned
type: string
required:
- engine
type: object
status:
properties:
Expand Down

0 comments on commit 039c3e6

Please sign in to comment.