Merge pull request #2 from pluralsh/master

print status for the request
pluralsh · Oct 6, 2022 · 01d3572 · 01d3572
2 parents 7114c79 + fc94165
commit 01d3572
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 38 deletions.
diff --git a/apis/database/v1alpha1/databaseaccess_types.go b/apis/database/v1alpha1/databaseaccess_types.go
@@ -27,7 +27,7 @@ type DatabaseAccessSpec struct {
 	DatabaseRequestName string `json:"databaseRequestName"`
 
 	// DatabaseAccessClassName is the name of the DatabaseAccessClass
-	DatabaseAccessClassName string `json:"bucketAccessClassName"`
+	DatabaseAccessClassName string `json:"databaseAccessClassName"`
 
 	// CredentialsSecretName is the name of the secret that operator should populate
 	// with the credentials. If a secret by this name already exists, then it is

diff --git a/apis/database/v1alpha1/databaseaccessclass_types.go b/apis/database/v1alpha1/databaseaccessclass_types.go
@@ -0,0 +1,38 @@
+package v1alpha1
+
+import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+func init() {
+	SchemeBuilder.Register(&DatabaseAccessClass{}, &DatabaseAccessClassList{})
+}
+
+type AuthenticationType string
+
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:scope=Cluster
+type DatabaseAccessClass struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// DriverName is the name of driver associated with
+	// this DatabaseAccess
+	DriverName string `json:"driverName"`
+
+	// AuthenticationType denotes the style of authentication
+	AuthenticationType AuthenticationType `json:"authenticationType"`
+
+	// Parameters is an opaque map for passing in configuration to a driver
+	// for granting access to a bucket
+	// +optional
+	Parameters map[string]string `json:"parameters,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+type DatabaseAccessClassList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []DatabaseAccessClass `json:"items"`
+}
diff --git a/apis/database/v1alpha1/databaseclass_types.go b/apis/database/v1alpha1/databaseclass_types.go
@@ -20,11 +20,8 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 func init() {
 	SchemeBuilder.Register(&DatabaseClass{}, &DatabaseClassList{})
-	SchemeBuilder.Register(&DatabaseAccessClass{}, &DatabaseAccessClassList{})
 }
 
-type AuthenticationType string
-
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope=Cluster
 type DatabaseClass struct {
@@ -49,32 +46,3 @@ type DatabaseClassList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []DatabaseClass `json:"items"`
 }
-
-// +kubebuilder:object:root=true
-// +kubebuilder:resource:scope=Cluster
-type DatabaseAccessClass struct {
-	metav1.TypeMeta `json:",inline"`
-
-	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	// DriverName is the name of driver associated with
-	// this DatabaseAccess
-	DriverName string `json:"driverName"`
-
-	// AuthenticationType denotes the style of authentication
-	AuthenticationType AuthenticationType `json:"authenticationType"`
-
-	// Parameters is an opaque map for passing in configuration to a driver
-	// for granting access to a bucket
-	// +optional
-	Parameters map[string]string `json:"parameters,omitempty"`
-}
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-type DatabaseAccessClassList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []DatabaseAccessClass `json:"items"`
-}
diff --git a/apis/database/v1alpha1/databaserequest_types.go b/apis/database/v1alpha1/databaserequest_types.go
@@ -51,6 +51,9 @@ type DatabaseRequestStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope=Namespaced
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Database ready status"
+// +kubebuilder:printcolumn:name="Database",type="string",JSONPath=".status.databaseName",description="Database name"
+
 type DatabaseRequest struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/config/crd/bases/database.plural.sh_databaseaccesses.yaml b/config/crd/bases/database.plural.sh_databaseaccesses.yaml
@@ -33,22 +33,22 @@ spec:
             type: object
           spec:
             properties:
-              bucketAccessClassName:
-                description: DatabaseAccessClassName is the name of the DatabaseAccessClass
-                type: string
               credentialsSecretName:
                 description: CredentialsSecretName is the name of the secret that
                   operator should populate with the credentials. If a secret by this
                   name already exists, then it is assumed that credentials have already
                   been generated. It is not overridden. This secret is deleted when
                   the DatabaseAccess is delted.
                 type: string
+              databaseAccessClassName:
+                description: DatabaseAccessClassName is the name of the DatabaseAccessClass
+                type: string
               databaseRequestName:
                 description: DatabaseRequestName is the name of the DatabaseRequest.
                 type: string
             required:
-            - bucketAccessClassName
             - credentialsSecretName
+            - databaseAccessClassName
             - databaseRequestName
             type: object
           status:

diff --git a/config/crd/bases/database.plural.sh_databaserequests.yaml b/config/crd/bases/database.plural.sh_databaserequests.yaml
@@ -15,7 +15,16 @@ spec:
     singular: databaserequest
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: Database ready status
+      jsonPath: .status.ready
+      name: Ready
+      type: string
+    - description: Database name
+      jsonPath: .status.databaseName
+      name: Database
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         properties: