Update DB condition types and phases (#598)

Signed-off-by: Tamal Saha <tamal@appscode.com>
kubedb · Oct 1, 2020 · 5c12de3 · 5c12de3
1 parent f27cb72
commit 5c12de3
Show file tree

Hide file tree

Showing 26 changed files with 134 additions and 138 deletions.
diff --git a/apis/kubedb/v1alpha1/constants.go b/apis/kubedb/v1alpha1/constants.go
@@ -140,24 +140,20 @@ const (
 
 // List of possible condition types for a KubeDB object
 const (
-	// used for Databases that are currently running
-	DatabaseRunning = "Running"
-	// used for Databases that are currently running
-	DatabasePodRunning = "PodRunning"
-	// used for Databases that are currently creating
-	DatabaseCreating = "Creating"
-	// used for Databases that are currently initializing
-	DatabaseeInitializing = "Initializing"
-	// used for Databases that are already initialized
-	DatabaseInitialized = "Initialized"
+	// used for Databases that have started provisioning
+	DatabaseProvisioningStarted = "ProvisioningStarted"
+	// used for Databases whose pods are ready
+	DatabaseReplicaReady = "ReplicaReady"
+	// used for Databases that are currently accepting connection
+	DatabaseAcceptingConnection = "AcceptingConnection"
+	// used for Databases that report status OK (also implies that we can connect to it)
+	DatabaseReady = "Ready"
+	// used for Databases that are already initialized using stash
+	DatabaseDataRestored = "DataRestored"
 	// used for Databases that are paused
 	DatabasePaused = "Paused"
-	// used for Databases that are halted
-	DatabaseHalted = "Halted"
-	// used for Databases that are failed
-	DatabaseFailed = "Failed"
 
 	// Condition reasons
-	DatabaseSuccessfullyInitialized = "SuccessfullyInitialized"
-	FailedToInitializeDatabase      = "FailedToInitialize"
+	DatabaseSuccessfullyRestored = "SuccessfullyDataRestored"
+	FailedToRestoreData          = "FailedToRestoreData"
 )
diff --git a/apis/kubedb/v1alpha1/types.go b/apis/kubedb/v1alpha1/types.go
@@ -50,22 +50,22 @@ type LeaderElectionConfig struct {
 	RetryPeriodSeconds int32 `json:"retryPeriodSeconds" protobuf:"varint,3,opt,name=retryPeriodSeconds"`
 }
 
-// +kubebuilder:validation:Enum=Running;Creating;Initializing;Paused;Halted;Failed
+// +kubebuilder:validation:Enum=Provisioning;Ready;Critical;NotReady;Paused;Halted
 type DatabasePhase string
 
 const (
-	// used for Databases that are currently running
-	DatabasePhaseRunning DatabasePhase = "Running"
-	// used for Databases that are currently creating
-	DatabasePhaseCreating DatabasePhase = "Creating"
-	// used for Databases that are currently initializing
-	DatabasePhaseInitializing DatabasePhase = "Initializing"
+	// used for Databases that are currently provisioning
+	DatabasePhaseProvisioning DatabasePhase = "Provisioning"
+	// used for Databases that are currently ReplicaReady, AcceptingConnection and Ready
+	DatabasePhaseRunning DatabasePhase = "Ready"
+	// used for Databases that can connect, ReplicaReady == false || Ready == false (eg, ES yellow)
+	DatabasePhaseCritical DatabasePhase = "Critical"
+	// used for Databases that can't connect
+	DatabasePhaseNotReady DatabasePhase = "NotReady"
 	// used for Databases that are paused
 	DatabasePhasePaused DatabasePhase = "Paused"
 	// used for Databases that are halted
 	DatabasePhaseHalted DatabasePhase = "Halted"
-	// used for Databases that are failed
-	DatabasePhaseFailed DatabasePhase = "Failed"
 )
 
 // +kubebuilder:validation:Enum=Durable;Ephemeral

diff --git a/crds/bindata.go b/crds/bindata.go
diff --git a/crds/kubedb.com_elasticsearches.v1.yaml b/crds/kubedb.com_elasticsearches.v1.yaml
@@ -4072,12 +4072,12 @@ spec:
                 type: integer
               phase:
                 enum:
-                - Running
-                - Creating
-                - Initializing
+                - Provisioning
+                - Ready
+                - Critical
+                - NotReady
                 - Paused
                 - Halted
-                - Failed
                 type: string
             type: object
         type: object

diff --git a/crds/kubedb.com_elasticsearches.yaml b/crds/kubedb.com_elasticsearches.yaml
@@ -4077,12 +4077,12 @@ spec:
               type: integer
             phase:
               enum:
-              - Running
-              - Creating
-              - Initializing
+              - Provisioning
+              - Ready
+              - Critical
+              - NotReady
               - Paused
               - Halted
-              - Failed
               type: string
           type: object
       type: object

diff --git a/crds/kubedb.com_etcds.v1.yaml b/crds/kubedb.com_etcds.v1.yaml
@@ -3045,12 +3045,12 @@ spec:
                 type: integer
               phase:
                 enum:
-                - Running
-                - Creating
-                - Initializing
+                - Provisioning
+                - Ready
+                - Critical
+                - NotReady
                 - Paused
                 - Halted
-                - Failed
                 type: string
             type: object
         type: object

diff --git a/crds/kubedb.com_etcds.yaml b/crds/kubedb.com_etcds.yaml
@@ -3050,12 +3050,12 @@ spec:
               type: integer
             phase:
               enum:
-              - Running
-              - Creating
-              - Initializing
+              - Provisioning
+              - Ready
+              - Critical
+              - NotReady
               - Paused
               - Halted
-              - Failed
               type: string
           type: object
       type: object

diff --git a/crds/kubedb.com_mariadbs.v1.yaml b/crds/kubedb.com_mariadbs.v1.yaml
@@ -3707,12 +3707,12 @@ spec:
                 type: integer
               phase:
                 enum:
-                - Running
-                - Creating
-                - Initializing
+                - Provisioning
+                - Ready
+                - Critical
+                - NotReady
                 - Paused
                 - Halted
-                - Failed
                 type: string
             type: object
         type: object

diff --git a/crds/kubedb.com_mariadbs.yaml b/crds/kubedb.com_mariadbs.yaml
@@ -3712,12 +3712,12 @@ spec:
               type: integer
             phase:
               enum:
-              - Running
-              - Creating
-              - Initializing
+              - Provisioning
+              - Ready
+              - Critical
+              - NotReady
               - Paused
               - Halted
-              - Failed
               type: string
           type: object
       type: object

diff --git a/crds/kubedb.com_memcacheds.v1.yaml b/crds/kubedb.com_memcacheds.v1.yaml
@@ -2931,12 +2931,12 @@ spec:
                 type: integer
               phase:
                 enum:
-                - Running
-                - Creating
-                - Initializing
+                - Provisioning
+                - Ready
+                - Critical
+                - NotReady
                 - Paused
                 - Halted
-                - Failed
                 type: string
             type: object
         type: object

diff --git a/crds/kubedb.com_memcacheds.yaml b/crds/kubedb.com_memcacheds.yaml
@@ -2936,12 +2936,12 @@ spec:
               type: integer
             phase:
               enum:
-              - Running
-              - Creating
-              - Initializing
+              - Provisioning
+              - Ready
+              - Critical
+              - NotReady
               - Paused
               - Halted
-              - Failed
               type: string
           type: object
       type: object

diff --git a/crds/kubedb.com_mongodbs.v1.yaml b/crds/kubedb.com_mongodbs.v1.yaml
@@ -9363,12 +9363,12 @@ spec:
                 type: integer
               phase:
                 enum:
-                - Running
-                - Creating
-                - Initializing
+                - Provisioning
+                - Ready
+                - Critical
+                - NotReady
                 - Paused
                 - Halted
-                - Failed
                 type: string
             type: object
         type: object

diff --git a/crds/kubedb.com_mongodbs.yaml b/crds/kubedb.com_mongodbs.yaml
@@ -9365,12 +9365,12 @@ spec:
               type: integer
             phase:
               enum:
-              - Running
-              - Creating
-              - Initializing
+              - Provisioning
+              - Ready
+              - Critical
+              - NotReady
               - Paused
               - Halted
-              - Failed
               type: string
           type: object
       type: object

diff --git a/crds/kubedb.com_mysqls.v1.yaml b/crds/kubedb.com_mysqls.v1.yaml
@@ -3729,12 +3729,12 @@ spec:
                 type: integer
               phase:
                 enum:
-                - Running
-                - Creating
-                - Initializing
+                - Provisioning
+                - Ready
+                - Critical
+                - NotReady
                 - Paused
                 - Halted
-                - Failed
                 type: string
             type: object
         type: object

diff --git a/crds/kubedb.com_mysqls.yaml b/crds/kubedb.com_mysqls.yaml
@@ -3734,12 +3734,12 @@ spec:
               type: integer
             phase:
               enum:
-              - Running
-              - Creating
-              - Initializing
+              - Provisioning
+              - Ready
+              - Critical
+              - NotReady
               - Paused
               - Halted
-              - Failed
               type: string
           type: object
       type: object

diff --git a/crds/kubedb.com_perconaxtradbs.v1.yaml b/crds/kubedb.com_perconaxtradbs.v1.yaml
@@ -3707,12 +3707,12 @@ spec:
                 type: integer
               phase:
                 enum:
-                - Running
-                - Creating
-                - Initializing
+                - Provisioning
+                - Ready
+                - Critical
+                - NotReady
                 - Paused
                 - Halted
-                - Failed
                 type: string
             type: object
         type: object

diff --git a/crds/kubedb.com_perconaxtradbs.yaml b/crds/kubedb.com_perconaxtradbs.yaml
@@ -3712,12 +3712,12 @@ spec:
               type: integer
             phase:
               enum:
-              - Running
-              - Creating
-              - Initializing
+              - Provisioning
+              - Ready
+              - Critical
+              - NotReady
               - Paused
               - Halted
-              - Failed
               type: string
           type: object
       type: object

diff --git a/crds/kubedb.com_pgbouncers.v1.yaml b/crds/kubedb.com_pgbouncers.v1.yaml
@@ -1827,12 +1827,12 @@ spec:
                 type: integer
               phase:
                 enum:
-                - Running
-                - Creating
-                - Initializing
+                - Provisioning
+                - Ready
+                - Critical
+                - NotReady
                 - Paused
                 - Halted
-                - Failed
                 type: string
             type: object
         type: object

diff --git a/crds/kubedb.com_pgbouncers.yaml b/crds/kubedb.com_pgbouncers.yaml
@@ -1832,12 +1832,12 @@ spec:
               type: integer
             phase:
               enum:
-              - Running
-              - Creating
-              - Initializing
+              - Provisioning
+              - Ready
+              - Critical
+              - NotReady
               - Paused
               - Halted
-              - Failed
               type: string
           type: object
       type: object

diff --git a/crds/kubedb.com_postgreses.v1.yaml b/crds/kubedb.com_postgreses.v1.yaml
@@ -4441,12 +4441,12 @@ spec:
                 type: integer
               phase:
                 enum:
-                - Running
-                - Creating
-                - Initializing
+                - Provisioning
+                - Ready
+                - Critical
+                - NotReady
                 - Paused
                 - Halted
-                - Failed
                 type: string
             type: object
         type: object

diff --git a/crds/kubedb.com_postgreses.yaml b/crds/kubedb.com_postgreses.yaml
@@ -4446,12 +4446,12 @@ spec:
               type: integer
             phase:
               enum:
-              - Running
-              - Creating
-              - Initializing
+              - Provisioning
+              - Ready
+              - Critical
+              - NotReady
               - Paused
               - Halted
-              - Failed
               type: string
           type: object
       type: object

diff --git a/crds/kubedb.com_proxysqls.v1.yaml b/crds/kubedb.com_proxysqls.v1.yaml
@@ -2381,12 +2381,12 @@ spec:
                 type: integer
               phase:
                 enum:
-                - Running
-                - Creating
-                - Initializing
+                - Provisioning
+                - Ready
+                - Critical
+                - NotReady
                 - Paused
                 - Halted
-                - Failed
                 type: string
             type: object
         type: object