#72 Moved the properties 'livenessProbe' and 'readinessProbe' under t…

…he property 'probe' in YAML. And increased the times in the default livenessProbe and readinessProbe.
reactive-tech · Dec 17, 2021 · 7d751fe · 7d751fe
1 parent b8f2bd5
commit 7d751fe
Show file tree

Hide file tree

Showing 14 changed files with 494 additions and 455 deletions.
diff --git a/Backlog b/Backlog
@@ -1,41 +1,44 @@
 
 - Scheduled for December 2021:
-    - update local kind
+    - update local kind & kubectl
     - Build controller with Kubebuilder v3.2.0
     - Remove warning for CronJob which was updated from beta to stable since Kubernetes 1.21
 
-- Scheduled for May 2022:
+- add a test in spec_readinessProbe_test and spec_livenessProbe_test so that
+  we test the default behaviour when no option is set from the YAML
+
+- Scheduled for either December 2021 or Jan 2022:
     - #20 : Delete PVC
 
-- Scheduled for June 2022:
+- Scheduled for May 2022:
     - #12 : Reuse PVC (see below) and Primary becomes a Replica
 
     As part of the available options for the field "failover.pvc", there would be:
-        - "keep": the default option currently with Kubegres where PVC are kept but not reused for safety and investigation reasons
+        - "retain": the default option currently with Kubegres where PVC are kept but not reused for safety and investigation reasons
         - "delete": the PVC will be deleted
         - "reuse": if the state of the PVC is healthy, it will be reused by the newly created Replica pod. I think that matches with your suggestion?
 
-- Scheduled for July 2022:
+- Scheduled for June 2022:
     - #?: PG bouncer
 
-- Scheduled for August 2022:
+- Scheduled for July 2022:
     - #51: add documentation about how to recover backup
     - add use cases documentation, for example how to expand storage manually and how to upgrade Postgres major version.
     - check how to setup log archiving in case of replica does not found a data
 
-- Scheduled for September 2022:
+- Scheduled for August 2022:
     - #46: Define Service Type for Primary and Replica
 
-- Scheduled for October 2022:
+- Scheduled for September 2022:
     - #7  : Allow major version upgrade using pg_upgrade
 
-- Scheduled for November 2022:
+- Scheduled for October 2022:
     - #35 : Restore database from a PV backup
 
-- Scheduled for December 2022:
+- Scheduled for November 2022:
     - #10 : Deploy Kubegres with a HELM chart
 
-- Scheduled for January 2023:
+- Scheduled for December 2022:
     - #? : Add a field to allow restarting StatefulSets and Pods via the YAML of "Kind: Kubegres"?
 
 Blocked:

diff --git a/api/v1/kubegres_types.go b/api/v1/kubegres_types.go
@@ -60,6 +60,11 @@ type Volume struct {
 	VolumeClaimTemplates []VolumeClaimTemplate `json:"volumeClaimTemplates,omitempty"`
 }
 
+type Probe struct {
+	LivenessProbe  *v1.Probe `json:"livenessProbe,omitempty"`
+	ReadinessProbe *v1.Probe `json:"readinessProbe,omitempty"`
+}
+
 type KubegresSpec struct {
 	Replicas         *int32                    `json:"replicas,omitempty"`
 	Image            string                    `json:"image,omitempty"`
@@ -74,8 +79,7 @@ type KubegresSpec struct {
 	Resources        v1.ResourceRequirements   `json:"resources,omitempty"`
 	Volume           Volume                    `json:"volume,omitempty"`
 	SecurityContext  *v1.PodSecurityContext    `json:"securityContext,omitempty"`
-	LivenessProbe    *v1.Probe                 `json:"livenessProbe,omitempty"`
-	ReadinessProbe   *v1.Probe                 `json:"readinessProbe,omitempty"`
+	Probe            Probe                     `json:"probe,omitempty"`
 }
 
 // ----------------------- STATUS -----------------------------------------

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go