Merge pull request #27 from datainfrahq/probes

fixes to rolling deploy
datainfrahq · Apr 25, 2023 · 1c196a8 · 1c196a8
2 parents b3f49af + 6bb8dff
commit 1c196a8
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= datainfrahq/pinot-control-plane:v0.0.5
+IMG ?= datainfrahq/pinot-control-plane:v0.0.6
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.26.0
 

diff --git a/docs/getting_started_tenants.md b/docs/getting_started_tenants.md
@@ -10,7 +10,7 @@ export STORAGE_CLASS_NAME=standard
 make helm-install-pinot-control-plane
 ```
 
-#### Install Zookeeper Opoerator and CR
+#### Install Zookeeper Operator and CR
 ```
 make helm-install-zk-operator
 ```

diff --git a/examples/00-pinot-basic/pinot-basic.yaml b/examples/00-pinot-basic/pinot-basic.yaml
@@ -60,6 +60,18 @@ spec:
       - protocol: TCP
         port: 9000
         targetPort: 9000
+    livenessProbe:
+      initialDelaySeconds: 60
+      periodSeconds: 10
+      httpGet:
+        path: "/health"
+        port: 9000
+    readinessProbe:
+      initialDelaySeconds: 60
+      periodSeconds: 10
+      httpGet:
+        path: "/health"
+        port: 9000
     env:
     - name: LOG4J_CONSOLE_LEVEL
       value: info
@@ -81,6 +93,18 @@ spec:
     - name: broker 
       containerPort: 8099
       protocol: TCP
+    livenessProbe:
+      initialDelaySeconds: 60
+      periodSeconds: 10
+      httpGet:
+        path: "/health"
+        port: 8099
+    readinessProbe:
+      initialDelaySeconds: 60
+      periodSeconds: 10
+      httpGet:
+        path: "/health"
+        port: 8099
     service:
       clusterIP: None
       type: ClusterIP
@@ -111,6 +135,18 @@ spec:
       containerPort: 8097
       protocol: TCP
     image: apachepinot/pinot:latest
+    livenessProbe:
+      initialDelaySeconds: 60
+      periodSeconds: 10
+      httpGet:
+        path: "/health"
+        port: 8097
+    readinessProbe:
+      initialDelaySeconds: 60
+      periodSeconds: 10
+      httpGet:
+        path: "/health"
+        port: 8097
     service:
       type: ClusterIP
       clusterIP: None
@@ -140,6 +176,18 @@ spec:
   - name: minion
     serviceAccountName: "default"
     image: apachepinot/pinot:latest
+    livenessProbe:
+      initialDelaySeconds: 60
+      periodSeconds: 10
+      httpGet:
+        path: "/health"
+        port: 9514
+    readinessProbe:
+      initialDelaySeconds: 60
+      periodSeconds: 10
+      httpGet:
+        path: "/health"
+        port: 9514
     service:
       clusterIP: None
       type: ClusterIP

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/datainfrahq/pinot-control-plane-k8s
 go 1.19
 
 require (
-	github.com/datainfrahq/operator-runtime v0.0.2-0.20230422185019-4fe7b9b92d4c
+	github.com/datainfrahq/operator-runtime v0.0.2-0.20230425161705-667c247a660b
 	github.com/go-logr/logr v1.2.3
 	github.com/onsi/ginkgo/v2 v2.6.0
 	github.com/onsi/gomega v1.24.1

diff --git a/go.sum b/go.sum
@@ -54,8 +54,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/datainfrahq/operator-runtime v0.0.2-0.20230422185019-4fe7b9b92d4c h1:EAWY05eHgbORdvaWThigxzpdT3UDYLiiHyIvtUIF3Bs=
-github.com/datainfrahq/operator-runtime v0.0.2-0.20230422185019-4fe7b9b92d4c/go.mod h1:Pd4ny0zdmpQIBYtZnK1knh0DFqUQ6LIdi71DsAXDr3E=
+github.com/datainfrahq/operator-runtime v0.0.2-0.20230425161705-667c247a660b h1:BuG3c4Gh7l44zBdEGiwXQHwI0f2nZ3igBjpByr89928=
+github.com/datainfrahq/operator-runtime v0.0.2-0.20230425161705-667c247a660b/go.mod h1:Pd4ny0zdmpQIBYtZnK1knh0DFqUQ6LIdi71DsAXDr3E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/helm/pinot-control-plane/Chart.yaml b/helm/pinot-control-plane/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: pinot-control-plane
 description: A Helm chart for Kubernetes
 type: application
-version: 0.0.5
-appVersion: "v0.0.5"
+version: 0.0.6
+appVersion: "v0.0.6"