fix: made the startup probe consistent for nodespec and druidspec (#122)

datainfrahq · Dec 26, 2023 · 81ac979 · 81ac979
1 parent 99639e5
commit 81ac979
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/apis/druid/v1alpha1/druid_types.go b/apis/druid/v1alpha1/druid_types.go
@@ -425,9 +425,9 @@ type DruidNodeSpec struct {
 	// +optional
 	ReadinessProbe *v1.Probe `json:"readinessProbe,omitempty"`
 
-	// StartUpProbes
+	// StartUpProbe
 	// +optional
-	StartUpProbes *v1.Probe `json:"startUpProbes,omitempty"`
+	StartUpProbe *v1.Probe `json:"startUpProbe,omitempty"`
 
 	// IngressAnnotations `Ingress` annotations to be populated in ingress spec.
 	// +optional

diff --git a/apis/druid/v1alpha1/zz_generated.deepcopy.go b/apis/druid/v1alpha1/zz_generated.deepcopy.go
diff --git a/chart/templates/crds/druid.apache.org_druids.yaml b/chart/templates/crds/druid.apache.org_druids.yaml
@@ -6512,8 +6512,8 @@ spec:
                             type: object
                         type: object
                       type: array
-                    startUpProbes:
-                      description: StartUpProbes
+                    startUpProbe:
+                      description: StartUpProbe
                       properties:
                         exec:
                           description: Exec specifies the action to take.

diff --git a/config/crd/bases/druid.apache.org_druids.yaml b/config/crd/bases/druid.apache.org_druids.yaml
@@ -6512,8 +6512,8 @@ spec:
                             type: object
                         type: object
                       type: array
-                    startUpProbes:
-                      description: StartUpProbes
+                    startUpProbe:
+                      description: StartUpProbe
                       properties:
                         exec:
                           description: Exec specifies the action to take.

diff --git a/config/druid.apache.org_druids.yaml b/config/druid.apache.org_druids.yaml
@@ -5926,7 +5926,7 @@ spec:
                             type: object
                         type: object
                       type: array
-                    startUpProbes:
+                    startUpProbe:
                       description: StartupProbe for nodeSpec
                       properties:
                         exec:

diff --git a/controllers/druid/handler.go b/controllers/druid/handler.go
@@ -1043,7 +1043,7 @@ func setReadinessProbe(nodeSpec *v1alpha1.DruidNodeSpec, m *v1alpha1.Druid) *v1.
 func setStartUpProbe(nodeSpec *v1alpha1.DruidNodeSpec, m *v1alpha1.Druid) *v1.Probe {
 	probeType := "startup"
 	startUpProbe := updateDefaultPortInProbe(
-		firstNonNilValue(nodeSpec.StartUpProbes, m.Spec.StartUpProbe).(*v1.Probe),
+		firstNonNilValue(nodeSpec.StartUpProbe, m.Spec.StartUpProbe).(*v1.Probe),
 		nodeSpec.DruidPort)
 	if startUpProbe == nil && m.Spec.DefaultProbes {
 		startUpProbe = setDefaultProbe(nodeSpec.DruidPort, nodeSpec.NodeType, probeType)

diff --git a/docs/api_specifications/druid.md b/docs/api_specifications/druid.md
@@ -1446,7 +1446,7 @@ Port is set to <code>druid.port</code> if not specified with httpGet handler.</p
 </tr>
 <tr>
 <td>
-<code>startUpProbes</code><br>
+<code>startUpProbe</code><br>
 <em>
 <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#probe-v1-core">
 Kubernetes core/v1.Probe
@@ -1455,7 +1455,7 @@ Kubernetes core/v1.Probe
 </td>
 <td>
 <em>(Optional)</em>
-<p>StartUpProbes</p>
+<p>StartUpProbe</p>
 </td>
 </tr>
 <tr>

diff --git a/e2e/configs/druid-mmless.yaml b/e2e/configs/druid-mmless.yaml
@@ -206,7 +206,7 @@ spec:
         periodSeconds: 10
         successThreshold: 1
         timeoutSeconds: 5
-      startUpProbes:
+      startUpProbe:
         failureThreshold: 20
         httpGet:
           path: /druid/historical/v1/loadstatus
@@ -272,7 +272,7 @@ spec:
         periodSeconds: 10
         successThreshold: 1
         timeoutSeconds: 5
-      startUpProbes:
+      startUpProbe:
         failureThreshold: 20
         httpGet:
           path: /druid/historical/v1/loadstatus

diff --git a/examples/tiny-cluster-mmless.yaml b/examples/tiny-cluster-mmless.yaml
@@ -208,7 +208,7 @@ spec:
         periodSeconds: 10
         successThreshold: 1
         timeoutSeconds: 5
-      startUpProbes:
+      startUpProbe:
         failureThreshold: 20
         httpGet:
           path: /druid/historical/v1/loadstatus
@@ -274,7 +274,7 @@ spec:
         periodSeconds: 10
         successThreshold: 1
         timeoutSeconds: 5
-      startUpProbes:
+      startUpProbe:
         failureThreshold: 20
         httpGet:
           path: /druid/historical/v1/loadstatus