Merge pull request #151 from kloeckner-i/METAL-3554/instance_name_fro…

…m_spec METAL-3554 read instance name from spec
kloeckner-i · Jul 14, 2022 · 06ce67e · 06ce67e
2 parents 84576ca + 6c8e6a0
commit 06ce67e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/api/v1alpha1/database_types.go b/api/v1alpha1/database_types.go
@@ -58,7 +58,6 @@ type DatabaseStatus struct {
 	ProxyStatus           DatabaseProxyStatus `json:"proxyStatus,omitempty"`
 	DatabaseName          string              `json:"database"`
 	UserName              string              `json:"user"`
-	InstanceName          string              `json:"instanceName"`
 }
 
 // DatabaseProxyStatus defines whether proxy for database is enabled or not
@@ -81,7 +80,7 @@ type DatabaseBackup struct {
 //+kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`,description="current db phase"
 //+kubebuilder:printcolumn:name="Status",type=boolean,JSONPath=`.status.status`,description="current db status"
 //+kubebuilder:printcolumn:name="Protected",type=boolean,JSONPath=`.spec.deletionProtected`,description="If database is protected to not get deleted."
-//+kubebuilder:printcolumn:name="DBInstance",type=string,JSONPath=`.status.instanceName`,description="instance reference"
+//+kubebuilder:printcolumn:name="DBInstance",type=string,JSONPath=`.spec.instance`,description="instance reference"
 //+kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`,description="time since creation of resource"
 
 // Database is the Schema for the databases API

diff --git a/charts/db-operator/Chart.yaml b/charts/db-operator/Chart.yaml
@@ -4,4 +4,4 @@ kubeVersion: ">= 1.19-prerelease <= 1.23-prerelease"
 appVersion: "1.6.4"
 description: A Database Operator
 name: db-operator
-version: 1.2.4
+version: 1.2.5
diff --git a/charts/db-operator/crds/kci.rocks_databases.yaml b/charts/db-operator/crds/kci.rocks_databases.yaml
@@ -32,7 +32,7 @@ spec:
       name: Protected
       type: boolean
     - description: instance reference
-      jsonPath: .status.instanceName
+      jsonPath: .spec.instance
       name: DBInstance
       type: string
     - description: time since creation of resource
@@ -115,8 +115,6 @@ spec:
             properties:
               database:
                 type: string
-              instanceName:
-                type: string
               instanceRef:
                 description: DbInstance is the Schema for the dbinstances API
                 properties:
@@ -305,7 +303,6 @@ spec:
                 type: string
             required:
             - database
-            - instanceName
             - instanceRef
             - phase
             - status

diff --git a/config/crd/bases/kci.rocks_databases.yaml b/config/crd/bases/kci.rocks_databases.yaml
@@ -32,7 +32,7 @@ spec:
       name: Protected
       type: boolean
     - description: instance reference
-      jsonPath: .status.instanceName
+      jsonPath: .spec.instance
       name: DBInstance
       type: string
     - description: time since creation of resource
@@ -115,8 +115,6 @@ spec:
             properties:
               database:
                 type: string
-              instanceName:
-                type: string
               instanceRef:
                 description: DbInstance is the Schema for the dbinstances API
                 properties:
@@ -305,7 +303,6 @@ spec:
                 type: string
             required:
             - database
-            - instanceName
             - instanceRef
             - phase
             - status