Signed-off-by: Hiranmoy Das Chowdhury <hiranmoy@appscode.com> (#1318)

kubedb · Oct 31, 2024 · 1f9523e · 1f9523e
1 parent a7bc124
commit 1f9523e
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 37 deletions.
diff --git a/apis/ops/v1alpha1/openapi_generated.go b/apis/ops/v1alpha1/openapi_generated.go
diff --git a/apis/ops/v1alpha1/pgbouncer_ops_helpers.go b/apis/ops/v1alpha1/pgbouncer_ops_helpers.go
@@ -64,7 +64,7 @@ func (p *PgBouncerOpsRequest) GetObjectMeta() metav1.ObjectMeta {
 }
 
 func (p *PgBouncerOpsRequest) GetDBRefName() string {
-	return p.Spec.ServerRef.Name
+	return p.Spec.DatabaseRef.Name
 }
 
 func (p *PgBouncerOpsRequest) GetRequestType() any {

diff --git a/apis/ops/v1alpha1/pgbouncer_ops_types.go b/apis/ops/v1alpha1/pgbouncer_ops_types.go
@@ -51,7 +51,7 @@ type PgBouncerOpsRequest struct {
 // PgBouncerOpsRequestSpec is the spec for PgBouncerOpsRequest
 type PgBouncerOpsRequestSpec struct {
 	// Specifies the PgBouncer reference
-	ServerRef core.LocalObjectReference `json:"serverRef"`
+	DatabaseRef core.LocalObjectReference `json:"databaseRef"`
 	// Specifies the ops request type: Upgrade, HorizontalScaling, VerticalScaling etc.
 	Type PgBouncerOpsRequestType `json:"type"`
 	// Specifies information necessary for upgrading PgBouncer

diff --git a/apis/ops/v1alpha1/zz_generated.deepcopy.go b/apis/ops/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/postgres/v1alpha1/openapi_generated.go b/apis/postgres/v1alpha1/openapi_generated.go
diff --git a/apis/postgres/v1alpha1/publisher_types.go b/apis/postgres/v1alpha1/publisher_types.go
@@ -33,7 +33,7 @@ type PublisherSpec struct {
 	// Name of the publisher
 	Name string `json:"name"`
 	// ServerRef specifies the database appbinding reference in any namespace.
-	ServerRef core.LocalObjectReference `json:"serverRef"`
+	DatabaseRef core.LocalObjectReference `json:"databaseRef"`
 	// DatabaseName is the name of the target database inside a Postgres instance.
 	DatabaseName string `json:"databaseName"`
 	// PublishAllTables is the option to publish all tables in the database

diff --git a/apis/postgres/v1alpha1/subscriber_types.go b/apis/postgres/v1alpha1/subscriber_types.go
@@ -33,7 +33,7 @@ type SubscriberSpec struct {
 	// Name of the publisher
 	Name string `json:"name"`
 	// ServerRef specifies the database appbinding reference in any namespace.
-	ServerRef core.LocalObjectReference `json:"serverRef"`
+	DatabaseRef core.LocalObjectReference `json:"databaseRef"`
 	// DatabaseName is the name of the target database inside a Postgres instance.
 	DatabaseName string `json:"databaseName"`
 	// Parameters to set while creating subscriber

diff --git a/apis/postgres/v1alpha1/zz_generated.deepcopy.go b/apis/postgres/v1alpha1/zz_generated.deepcopy.go
diff --git a/crds/ops.kubedb.com_pgbounceropsrequests.yaml b/crds/ops.kubedb.com_pgbounceropsrequests.yaml
@@ -79,6 +79,13 @@ spec:
                 required:
                 - pgbouncer
                 type: object
+              databaseRef:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               horizontalScaling:
                 properties:
                   replicas:
@@ -87,13 +94,6 @@ spec:
                 type: object
               restart:
                 type: object
-              serverRef:
-                properties:
-                  name:
-                    default: ""
-                    type: string
-                type: object
-                x-kubernetes-map-type: atomic
               timeout:
                 type: string
               tls:
@@ -298,7 +298,7 @@ spec:
                     type: object
                 type: object
             required:
-            - serverRef
+            - databaseRef
             - type
             type: object
           status:

diff --git a/crds/postgres.kubedb.com_publishers.yaml b/crds/postgres.kubedb.com_publishers.yaml
@@ -111,6 +111,13 @@ spec:
                 type: object
               databaseName:
                 type: string
+              databaseRef:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               deletionPolicy:
                 default: Delete
                 enum:
@@ -137,21 +144,14 @@ spec:
                 type: object
               publishAllTables:
                 type: boolean
-              serverRef:
-                properties:
-                  name:
-                    default: ""
-                    type: string
-                type: object
-                x-kubernetes-map-type: atomic
               tables:
                 items:
                   type: string
                 type: array
             required:
             - databaseName
+            - databaseRef
             - name
-            - serverRef
             type: object
           status:
             properties:

diff --git a/crds/postgres.kubedb.com_subscribers.yaml b/crds/postgres.kubedb.com_subscribers.yaml
@@ -41,6 +41,13 @@ spec:
             properties:
               databaseName:
                 type: string
+              databaseRef:
+                properties:
+                  name:
+                    default: ""
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
               deletionPolicy:
                 default: Delete
                 enum:
@@ -113,18 +120,11 @@ spec:
                     - refs
                     type: object
                 type: object
-              serverRef:
-                properties:
-                  name:
-                    default: ""
-                    type: string
-                type: object
-                x-kubernetes-map-type: atomic
             required:
             - databaseName
+            - databaseRef
             - name
             - publisher
-            - serverRef
             type: object
           status:
             properties: