WIP

vshn · Oct 14, 2024 · 5ee54a4 · 5ee54a4
1 parent cbfb45d
commit 5ee54a4
Show file tree

Hide file tree

Showing 13 changed files with 371 additions and 10 deletions.
diff --git a/apis/vshn/v1/dbaas_vshn_mariadb.go b/apis/vshn/v1/dbaas_vshn_mariadb.go
@@ -99,8 +99,8 @@ type VSHNMariaDBServiceSpec struct {
 	// ServiceLevel defines the service level of this service. Either Best Effort or Guaranteed Availability is allowed.
 	ServiceLevel VSHNDBaaSServiceLevel `json:"serviceLevel,omitempty"`
 
-	// +kubebuilder:default="standalone"
-	// +kubebuilder:validation:Enum=replication;standalone
+	// Access defines additional users and databases for this instance.
+	Access []VSHNAccess `json:"access,omitempty"`
 }
 
 // VSHNMariaDBTLSSpec contains settings to control tls traffic of a service.

diff --git a/apis/vshn/v1/dbaas_vshn_postgresql.go b/apis/vshn/v1/dbaas_vshn_postgresql.go
@@ -154,6 +154,7 @@ type VSHNPostgreSQLServiceSpec struct {
 	// +kubebuilder:default=false
 	VacuumEnabled bool `json:"vacuumEnabled,omitempty"`
 
+	// Access defines additional users and databases for this instance.
 	Access []VSHNAccess `json:"access,omitempty"`
 }
 

diff --git a/apis/vshn/v1/zz_generated.deepcopy.go b/apis/vshn/v1/zz_generated.deepcopy.go
diff --git a/crds/vshn.appcat.vshn.io_vshnkeycloaks.yaml b/crds/vshn.appcat.vshn.io_vshnkeycloaks.yaml
@@ -9776,6 +9776,7 @@ spec:
                               description: Service contains PostgreSQL DBaaS specific properties
                               properties:
                                 access:
+                                  description: Access defines additional users and databases for this instance.
                                   items:
                                     properties:
                                       database:

diff --git a/crds/vshn.appcat.vshn.io_vshnmariadbs.yaml b/crds/vshn.appcat.vshn.io_vshnmariadbs.yaml
@@ -4843,6 +4843,47 @@ spec:
                     service:
                       description: Service contains MariaDB DBaaS specific properties
                       properties:
+                        access:
+                          description: Access defines additional users and databases for this instance.
+                          items:
+                            properties:
+                              database:
+                                description: Database is the name of the database to create, defaults to user.
+                                type: string
+                              privileges:
+                                description: |-
+                                  Privileges specifies the privileges to grant the user. Please check
+                                  the database's docs for available privileges.
+                                items:
+                                  type: string
+                                type: array
+                              user:
+                                description: |-
+                                  User specifies the username. If all other fields are left empty
+                                  then a new database with the same name and all permissions will be created.
+                                type: string
+                              writeConnectionSecretToRef:
+                                description: |-
+                                  WriteConnectionSecretToReference specifies the namespace and name of a
+                                  Secret to which any connection details for this user should
+                                  be written.
+                                  If not specified, a secret with the name $claimname-$username will be
+                                  created in the namespace where the claim is located.
+                                properties:
+                                  name:
+                                    description: Name of the secret.
+                                    type: string
+                                  namespace:
+                                    description: Namespace of the secret.
+                                    type: string
+                                required:
+                                  - name
+                                  - namespace
+                                type: object
+                            required:
+                              - user
+                            type: object
+                          type: array
                         mariadbSettings:
                           description: MariadbSettings contains additional MariaDB settings.
                           type: string

diff --git a/crds/vshn.appcat.vshn.io_vshnnextclouds.yaml b/crds/vshn.appcat.vshn.io_vshnnextclouds.yaml
@@ -9742,6 +9742,7 @@ spec:
                               description: Service contains PostgreSQL DBaaS specific properties
                               properties:
                                 access:
+                                  description: Access defines additional users and databases for this instance.
                                   items:
                                     properties:
                                       database:

diff --git a/crds/vshn.appcat.vshn.io_vshnpostgresqls.yaml b/crds/vshn.appcat.vshn.io_vshnpostgresqls.yaml
@@ -4966,6 +4966,7 @@ spec:
                       description: Service contains PostgreSQL DBaaS specific properties
                       properties:
                         access:
+                          description: Access defines additional users and databases for this instance.
                           items:
                             properties:
                               database:

diff --git a/crds/vshn.appcat.vshn.io_xvshnkeycloaks.yaml b/crds/vshn.appcat.vshn.io_xvshnkeycloaks.yaml
@@ -11556,6 +11556,8 @@ spec:
                               properties
                             properties:
                               access:
+                                description: Access defines additional users and databases
+                                  for this instance.
                                 items:
                                   properties:
                                     database:

diff --git a/crds/vshn.appcat.vshn.io_xvshnmariadbs.yaml b/crds/vshn.appcat.vshn.io_xvshnmariadbs.yaml
@@ -5567,6 +5567,49 @@ spec:
                   service:
                     description: Service contains MariaDB DBaaS specific properties
                     properties:
+                      access:
+                        description: Access defines additional users and databases
+                          for this instance.
+                        items:
+                          properties:
+                            database:
+                              description: Database is the name of the database to
+                                create, defaults to user.
+                              type: string
+                            privileges:
+                              description: |-
+                                Privileges specifies the privileges to grant the user. Please check
+                                the database's docs for available privileges.
+                              items:
+                                type: string
+                              type: array
+                            user:
+                              description: |-
+                                User specifies the username. If all other fields are left empty
+                                then a new database with the same name and all permissions will be created.
+                              type: string
+                            writeConnectionSecretToRef:
+                              description: |-
+                                WriteConnectionSecretToReference specifies the namespace and name of a
+                                Secret to which any connection details for this user should
+                                be written.
+                                If not specified, a secret with the name $claimname-$username will be
+                                created in the namespace where the claim is located.
+                              properties:
+                                name:
+                                  description: Name of the secret.
+                                  type: string
+                                namespace:
+                                  description: Namespace of the secret.
+                                  type: string
+                              required:
+                              - name
+                              - namespace
+                              type: object
+                          required:
+                          - user
+                          type: object
+                        type: array
                       mariadbSettings:
                         description: MariadbSettings contains additional MariaDB settings.
                         type: string

diff --git a/crds/vshn.appcat.vshn.io_xvshnnextclouds.yaml b/crds/vshn.appcat.vshn.io_xvshnnextclouds.yaml
@@ -11520,6 +11520,8 @@ spec:
                               properties
                             properties:
                               access:
+                                description: Access defines additional users and databases
+                                  for this instance.
                                 items:
                                   properties:
                                     database:

diff --git a/crds/vshn.appcat.vshn.io_xvshnpostgresqls.yaml b/crds/vshn.appcat.vshn.io_xvshnpostgresqls.yaml
@@ -5648,6 +5648,8 @@ spec:
                     description: Service contains PostgreSQL DBaaS specific properties
                     properties:
                       access:
+                        description: Access defines additional users and databases
+                          for this instance.
                         items:
                           properties:
                             database: