Merge pull request #546 from YZ775/add-statefulset-condition

Add Updated Conditon in Status
cybozu-go · Aug 24, 2023 · 6b953a6 · 6b953a6
2 parents d91dc27 + b7d6985
commit 6b953a6
Show file tree

Hide file tree

Showing 24 changed files with 682 additions and 336 deletions.
diff --git a/api/v1beta1/mysqlcluster_types.go b/api/v1beta1/mysqlcluster_types.go
@@ -252,7 +252,7 @@ type MySQLClusterStatus struct {
 
 	// Conditions is an array of conditions.
 	// +optional
-	Conditions []MySQLClusterCondition `json:"conditions,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// CurrentPrimaryIndex is the index of the current primary Pod in StatefulSet.
 	// Initially, this is zero.
@@ -287,35 +287,12 @@ type MySQLClusterStatus struct {
 	ReconcileInfo ReconcileInfo `json:"reconcileInfo"`
 }
 
-// MySQLClusterCondition defines the condition of MySQLCluster.
-type MySQLClusterCondition struct {
-	// Type is the type of the condition.
-	Type MySQLClusterConditionType `json:"type"`
-
-	// Status is the status of the condition.
-	Status corev1.ConditionStatus `json:"status"`
-
-	// Reason is a one-word CamelCase reason for the condition's last transition.
-	// +optional
-	Reason string `json:"reason,omitempty"`
-
-	// Message is a human-readable message indicating details about last transition.
-	// +optional
-	Message string `json:"message,omitempty"`
-
-	// LastTransitionTime is the last time the condition transits from one status to another.
-	LastTransitionTime metav1.Time `json:"lastTransitionTime"`
-}
-
-// MySQLClusterConditionType is the type of MySQLCluster condition.
-// +kubebuilder:validation:Enum=Initialized;Available;Healthy
-type MySQLClusterConditionType string
-
-// Valid values for MySQLClusterConditionType
 const (
-	ConditionInitialized MySQLClusterConditionType = "Initialized"
-	ConditionAvailable   MySQLClusterConditionType = "Available"
-	ConditionHealthy     MySQLClusterConditionType = "Healthy"
+	ConditionInitialized      string = "Initialized"
+	ConditionAvailable        string = "Available"
+	ConditionHealthy          string = "Healthy"
+	ConditionStatefulSetReady string = "StatefulSetReady"
+	ConditionReconcileSuccess string = "ReconcileSuccess"
 )
 
 // BackupStatus represents the status of the last successful backup.

diff --git a/api/v1beta1/zz_generated.conversion.go b/api/v1beta1/zz_generated.conversion.go
diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/api/v1beta2/mysqlcluster_types.go b/api/v1beta2/mysqlcluster_types.go
@@ -566,7 +566,7 @@ type MySQLClusterStatus struct {
 
 	// Conditions is an array of conditions.
 	// +optional
-	Conditions []MySQLClusterCondition `json:"conditions,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// CurrentPrimaryIndex is the index of the current primary Pod in StatefulSet.
 	// Initially, this is zero.
@@ -601,35 +601,12 @@ type MySQLClusterStatus struct {
 	ReconcileInfo ReconcileInfo `json:"reconcileInfo"`
 }
 
-// MySQLClusterCondition defines the condition of MySQLCluster.
-type MySQLClusterCondition struct {
-	// Type is the type of the condition.
-	Type MySQLClusterConditionType `json:"type"`
-
-	// Status is the status of the condition.
-	Status corev1.ConditionStatus `json:"status"`
-
-	// Reason is a one-word CamelCase reason for the condition's last transition.
-	// +optional
-	Reason string `json:"reason,omitempty"`
-
-	// Message is a human-readable message indicating details about last transition.
-	// +optional
-	Message string `json:"message,omitempty"`
-
-	// LastTransitionTime is the last time the condition transits from one status to another.
-	LastTransitionTime metav1.Time `json:"lastTransitionTime"`
-}
-
-// MySQLClusterConditionType is the type of MySQLCluster condition.
-// +kubebuilder:validation:Enum=Initialized;Available;Healthy
-type MySQLClusterConditionType string
-
-// Valid values for MySQLClusterConditionType
 const (
-	ConditionInitialized MySQLClusterConditionType = "Initialized"
-	ConditionAvailable   MySQLClusterConditionType = "Available"
-	ConditionHealthy     MySQLClusterConditionType = "Healthy"
+	ConditionInitialized      string = "Initialized"
+	ConditionAvailable        string = "Available"
+	ConditionHealthy          string = "Healthy"
+	ConditionStatefulSetReady string = "StatefulSetReady"
+	ConditionReconcileSuccess string = "ReconcileSuccess"
 )
 
 // BackupStatus represents the status of the last successful backup.

diff --git a/api/v1beta2/zz_generated.deepcopy.go b/api/v1beta2/zz_generated.deepcopy.go
diff --git a/charts/moco/templates/generated/crds/moco_crds.yaml b/charts/moco/templates/generated/crds/moco_crds.yaml
@@ -9596,30 +9596,43 @@ spec:
                 conditions:
                   description: Conditions is an array of conditions.
                   items:
-                    description: MySQLClusterCondition defines the condition of MyS
+                    description: Condition contains details for one aspect of the c
                     properties:
                       lastTransitionTime:
-                        description: 'LastTransitionTime is the last time the condition '
+                        description: 'lastTransitionTime is the last time the condition '
                         format: date-time
                         type: string
                       message:
-                        description: Message is a human-readable message indicating det
+                        description: message is a human readable message indicating det
+                        maxLength: 32768
                         type: string
+                      observedGeneration:
+                        description: observedGeneration represents the .metadata.
+                        format: int64
+                        minimum: 0
+                        type: integer
                       reason:
-                        description: Reason is a one-word CamelCase reason for the cond
+                        description: reason contains a programmatic identifier indicati
+                        maxLength: 1024
+                        minLength: 1
+                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
                         type: string
                       status:
-                        description: Status is the status of the condition.
+                        description: status of the condition, one of True, False, Unkno
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
                         type: string
                       type:
-                        description: Type is the type of the condition.
-                        enum:
-                          - Initialized
-                          - Available
-                          - Healthy
+                        description: type of condition in CamelCase or in foo.example.
+                        maxLength: 316
+                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                         type: string
                     required:
                       - lastTransitionTime
+                      - message
+                      - reason
                       - status
                       - type
                     type: object
@@ -15339,30 +15352,43 @@ spec:
                 conditions:
                   description: Conditions is an array of conditions.
                   items:
-                    description: MySQLClusterCondition defines the condition of MyS
+                    description: Condition contains details for one aspect of the c
                     properties:
                       lastTransitionTime:
-                        description: 'LastTransitionTime is the last time the condition '
+                        description: 'lastTransitionTime is the last time the condition '
                         format: date-time
                         type: string
                       message:
-                        description: Message is a human-readable message indicating det
+                        description: message is a human readable message indicating det
+                        maxLength: 32768
                         type: string
+                      observedGeneration:
+                        description: observedGeneration represents the .metadata.
+                        format: int64
+                        minimum: 0
+                        type: integer
                       reason:
-                        description: Reason is a one-word CamelCase reason for the cond
+                        description: reason contains a programmatic identifier indicati
+                        maxLength: 1024
+                        minLength: 1
+                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
                         type: string
                       status:
-                        description: Status is the status of the condition.
+                        description: status of the condition, one of True, False, Unkno
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
                         type: string
                       type:
-                        description: Type is the type of the condition.
-                        enum:
-                          - Initialized
-                          - Available
-                          - Healthy
+                        description: type of condition in CamelCase or in foo.example.
+                        maxLength: 316
+                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                         type: string
                     required:
                       - lastTransitionTime
+                      - message
+                      - reason
                       - status
                       - type
                     type: object