This is an automated email from the ASF dual-hosted git repository.

aengineer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new d3a5abe  HDDS-1668. Add liveness probe to the example k8s resources 
files
     new 1411513  Merge pull request #944 from elek/HDDS-1668
d3a5abe is described below

commit d3a5abec71f2ddefc4fe9c8cd9bb0aaad8b5db80
Author: Márton Elek <[email protected]>
AuthorDate: Sat Jun 29 01:18:28 2019 +0200

    HDDS-1668. Add liveness probe to the example k8s resources files
---
 .../dist/src/main/k8s/definitions/ozone/om-ss.yaml | 13 +++++-----
 .../src/main/k8s/definitions/ozone/s3g-ss.yaml     |  5 ++++
 .../src/main/k8s/definitions/ozone/scm-ss.yaml     |  4 ++++
 .../examples/minikube/datanode-statefulset.yaml    |  6 ++---
 .../main/k8s/examples/minikube/om-statefulset.yaml | 26 +++++++-------------
 .../k8s/examples/minikube/s3g-statefulset.yaml     | 11 ++++++---
 .../k8s/examples/minikube/scm-statefulset.yaml     | 16 ++++++++-----
 .../src/main/k8s/examples/ozone-csi/Flekszible     |  1 +
 .../k8s/examples/ozone-csi/datanode-daemonset.yaml | 10 +++++---
 .../{Flekszible => datanode-service.yaml}          | 21 +++++++++-------
 .../datanode-statefulset.yaml                      |  6 ++---
 .../k8s/examples/ozone-csi/om-statefulset.yaml     | 28 ++++++++--------------
 .../k8s/examples/ozone-csi/s3g-statefulset.yaml    | 12 ++++++----
 .../k8s/examples/ozone-csi/scm-statefulset.yaml    | 18 +++++++++-----
 .../examples/ozone-dev/datanode-statefulset.yaml   |  6 ++---
 .../k8s/examples/ozone-dev/om-statefulset.yaml     | 28 +++++++---------------
 .../k8s/examples/ozone-dev/s3g-statefulset.yaml    | 11 ++++++---
 .../k8s/examples/ozone-dev/scm-statefulset.yaml    | 16 ++++++++-----
 .../k8s/examples/ozone/datanode-statefulset.yaml   |  6 ++---
 .../main/k8s/examples/ozone/om-statefulset.yaml    | 26 +++++++-------------
 .../main/k8s/examples/ozone/s3g-statefulset.yaml   | 11 ++++++---
 .../main/k8s/examples/ozone/scm-statefulset.yaml   | 16 ++++++++-----
 22 files changed, 156 insertions(+), 141 deletions(-)

diff --git a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/om-ss.yaml 
b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/om-ss.yaml
index 5c2f7cc..befc21e 100644
--- a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/om-ss.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/om-ss.yaml
@@ -38,13 +38,6 @@ spec:
     spec:
       securityContext:
         fsGroup: 1000
-      initContainers:
-      - name: init
-        image: "@docker.image@"
-        args: ["ozone","om","--init"]
-        env:
-        - name: WAITFOR
-          value: scm-0.scm:9876
       containers:
       - name: om
         image: "@docker.image@"
@@ -52,4 +45,10 @@ spec:
         env:
         - name: WAITFOR
           value: scm-0.scm:9876
+        - name: ENSURE_OM_INITIALIZED
+          value: /data/metadata/om/current/VERSION
+        livenessProbe:
+          tcpSocket:
+            port: 9862
+          initialDelaySeconds: 30
       volumes: []
diff --git a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/s3g-ss.yaml 
b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/s3g-ss.yaml
index 43044c9..fc8ff9a 100644
--- a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/s3g-ss.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/s3g-ss.yaml
@@ -36,3 +36,8 @@ spec:
       - name: s3g
         image: "@docker.image@"
         args: ["ozone","s3g"]
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 9878
+          initialDelaySeconds: 30
diff --git a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/scm-ss.yaml 
b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/scm-ss.yaml
index b3c36b7..d386afc 100644
--- a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/scm-ss.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/scm-ss.yaml
@@ -46,3 +46,7 @@ spec:
       - name: scm
         image: "@docker.image@"
         args: ["ozone","scm"]
+        livenessProbe:
+          tcpSocket:
+            port: 9861
+          initialDelaySeconds: 30
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/minikube/datanode-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/minikube/datanode-statefulset.yaml
index 6c8d1bf..452e258 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/minikube/datanode-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/minikube/datanode-statefulset.yaml
@@ -55,12 +55,12 @@ spec:
         args:
         - ozone
         - datanode
-        envFrom:
-        - configMapRef:
-            name: config
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       volumes:
       - name: data
         emptyDir: {}
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/minikube/om-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/minikube/om-statefulset.yaml
index c8ff81b..172df34 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/minikube/om-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/minikube/om-statefulset.yaml
@@ -39,37 +39,27 @@ spec:
     spec:
       securityContext:
         fsGroup: 1000
-      initContainers:
-      - name: init
+      containers:
+      - name: om
         image: '@docker.image@'
         args:
         - ozone
         - om
-        - --init
         env:
         - name: WAITFOR
           value: scm-0.scm:9876
-        envFrom:
-        - configMapRef:
-            name: config
+        - name: ENSURE_OM_INITIALIZED
+          value: /data/metadata/om/current/VERSION
+        livenessProbe:
+          tcpSocket:
+            port: 9862
+          initialDelaySeconds: 30
         volumeMounts:
         - name: data
           mountPath: /data
-      containers:
-      - name: om
-        image: '@docker.image@'
-        args:
-        - ozone
-        - om
-        env:
-        - name: WAITFOR
-          value: scm-0.scm:9876
         envFrom:
         - configMapRef:
             name: config
-        volumeMounts:
-        - name: data
-          mountPath: /data
       volumes:
       - name: data
         emptyDir: {}
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/minikube/s3g-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/minikube/s3g-statefulset.yaml
index c7e13e5..1718fed 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/minikube/s3g-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/minikube/s3g-statefulset.yaml
@@ -39,12 +39,17 @@ spec:
         args:
         - ozone
         - s3g
-        envFrom:
-        - configMapRef:
-            name: config
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 9878
+          initialDelaySeconds: 30
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       volumes:
       - name: data
         emptyDir: {}
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/minikube/scm-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/minikube/scm-statefulset.yaml
index e1deed8..7f1606d 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/minikube/scm-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/minikube/scm-statefulset.yaml
@@ -46,24 +46,28 @@ spec:
         - ozone
         - scm
         - --init
-        envFrom:
-        - configMapRef:
-            name: config
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       containers:
       - name: scm
         image: '@docker.image@'
         args:
         - ozone
         - scm
-        envFrom:
-        - configMapRef:
-            name: config
+        livenessProbe:
+          tcpSocket:
+            port: 9861
+          initialDelaySeconds: 30
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       volumes:
       - name: data
         emptyDir: {}
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/Flekszible 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/Flekszible
index 7e4f3f1..5a3b89a 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/Flekszible
@@ -21,5 +21,6 @@ import:
   - path: ozone
     transformations:
       - type: ozone/csi
+      - type: ozone/emptydir
   - path: pv-test
     destination: pv-test
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-daemonset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-daemonset.yaml
index 6e3b3b9..67c8fc2 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-daemonset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-daemonset.yaml
@@ -44,12 +44,16 @@ spec:
         ports:
         - containerPort: 9870
           name: rpc
-        envFrom:
-        - configMapRef:
-            name: config
+        livenessProbe:
+          tcpSocket:
+            port: 9858
+          initialDelaySeconds: 30
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       initContainers: []
       volumes:
       - name: data
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/Flekszible 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-service.yaml
similarity index 82%
copy from hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/Flekszible
copy to hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-service.yaml
index 7e4f3f1..929e7a2 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-service.yaml
@@ -14,12 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source:
-  - path: ../../definitions
-import:
-  - path: ozone-csi
-  - path: ozone
-    transformations:
-      - type: ozone/csi
-  - path: pv-test
-    destination: pv-test
+apiVersion: v1
+kind: Service
+metadata:
+  name: datanode
+spec:
+  ports:
+  - port: 9870
+    name: rpc
+  clusterIP: None
+  selector:
+    app: ozone
+    component: datanode
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/minikube/datanode-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-statefulset.yaml
similarity index 100%
copy from 
hadoop-ozone/dist/src/main/k8s/examples/minikube/datanode-statefulset.yaml
copy to 
hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-statefulset.yaml
index 6c8d1bf..452e258 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/minikube/datanode-statefulset.yaml
+++ 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/datanode-statefulset.yaml
@@ -55,12 +55,12 @@ spec:
         args:
         - ozone
         - datanode
-        envFrom:
-        - configMapRef:
-            name: config
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       volumes:
       - name: data
         emptyDir: {}
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/om-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/om-statefulset.yaml
index 884dd46..172df34 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/om-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/om-statefulset.yaml
@@ -37,37 +37,29 @@ spec:
         prometheus.io/port: "9874"
         prometheus.io/path: /prom
     spec:
-      initContainers:
-      - name: init
+      securityContext:
+        fsGroup: 1000
+      containers:
+      - name: om
         image: '@docker.image@'
         args:
         - ozone
         - om
-        - --init
         env:
         - name: WAITFOR
           value: scm-0.scm:9876
-        envFrom:
-        - configMapRef:
-            name: config
+        - name: ENSURE_OM_INITIALIZED
+          value: /data/metadata/om/current/VERSION
+        livenessProbe:
+          tcpSocket:
+            port: 9862
+          initialDelaySeconds: 30
         volumeMounts:
         - name: data
           mountPath: /data
-      containers:
-      - name: om
-        image: '@docker.image@'
-        args:
-        - ozone
-        - om
-        env:
-        - name: WAITFOR
-          value: scm-0.scm:9876
         envFrom:
         - configMapRef:
             name: config
-        volumeMounts:
-        - name: data
-          mountPath: /data
       volumes:
       - name: data
         emptyDir: {}
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/s3g-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/s3g-statefulset.yaml
index b608cde..1718fed 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/s3g-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/s3g-statefulset.yaml
@@ -39,13 +39,17 @@ spec:
         args:
         - ozone
         - s3g
-        envFrom:
-        - configMapRef:
-            name: config
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 9878
+          initialDelaySeconds: 30
         volumeMounts:
         - name: data
           mountPath: /data
-      initContainers: []
+        envFrom:
+        - configMapRef:
+            name: config
       volumes:
       - name: data
         emptyDir: {}
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/scm-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/scm-statefulset.yaml
index 55b5672..7f1606d 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/scm-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-csi/scm-statefulset.yaml
@@ -37,6 +37,8 @@ spec:
         prometheus.io/port: "9876"
         prometheus.io/path: /prom
     spec:
+      securityContext:
+        fsGroup: 1000
       initContainers:
       - name: init
         image: '@docker.image@'
@@ -44,24 +46,28 @@ spec:
         - ozone
         - scm
         - --init
-        envFrom:
-        - configMapRef:
-            name: config
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       containers:
       - name: scm
         image: '@docker.image@'
         args:
         - ozone
         - scm
-        envFrom:
-        - configMapRef:
-            name: config
+        livenessProbe:
+          tcpSocket:
+            port: 9861
+          initialDelaySeconds: 30
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       volumes:
       - name: data
         emptyDir: {}
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/datanode-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/datanode-statefulset.yaml
index 843aa94..b8e43e4 100644
--- 
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/datanode-statefulset.yaml
+++ 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/datanode-statefulset.yaml
@@ -55,9 +55,6 @@ spec:
         args:
         - ozone
         - datanode
-        envFrom:
-        - configMapRef:
-            name: config
         env:
         - name: JAEGER_SAMPLER_TYPE
           value: probabilistic
@@ -68,6 +65,9 @@ spec:
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       volumes:
       - name: data
         emptyDir: {}
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/om-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/om-statefulset.yaml
index 8d7e9f1..8f57a38 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/om-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/om-statefulset.yaml
@@ -39,22 +39,6 @@ spec:
     spec:
       securityContext:
         fsGroup: 1000
-      initContainers:
-      - name: init
-        image: '@docker.image@'
-        args:
-        - ozone
-        - om
-        - --init
-        env:
-        - name: WAITFOR
-          value: scm-0.scm:9876
-        envFrom:
-        - configMapRef:
-            name: config
-        volumeMounts:
-        - name: data
-          mountPath: /data
       containers:
       - name: om
         image: '@docker.image@'
@@ -64,18 +48,24 @@ spec:
         env:
         - name: WAITFOR
           value: scm-0.scm:9876
+        - name: ENSURE_OM_INITIALIZED
+          value: /data/metadata/om/current/VERSION
         - name: JAEGER_SAMPLER_TYPE
           value: probabilistic
         - name: JAEGER_SAMPLER_PARAM
           value: "0.01"
         - name: JAEGER_AGENT_HOST
           value: jaeger-0.jaeger
-        envFrom:
-        - configMapRef:
-            name: config
+        livenessProbe:
+          tcpSocket:
+            port: 9862
+          initialDelaySeconds: 30
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       volumes:
       - name: data
         emptyDir: {}
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/s3g-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/s3g-statefulset.yaml
index 72d5550..d6288cd 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/s3g-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/s3g-statefulset.yaml
@@ -39,9 +39,11 @@ spec:
         args:
         - ozone
         - s3g
-        envFrom:
-        - configMapRef:
-            name: config
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 9878
+          initialDelaySeconds: 30
         env:
         - name: JAEGER_SAMPLER_TYPE
           value: probabilistic
@@ -52,6 +54,9 @@ spec:
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       volumes:
       - name: data
         emptyDir: {}
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/scm-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/scm-statefulset.yaml
index 8717ff7..e9b5add 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/scm-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/scm-statefulset.yaml
@@ -46,21 +46,22 @@ spec:
         - ozone
         - scm
         - --init
-        envFrom:
-        - configMapRef:
-            name: config
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       containers:
       - name: scm
         image: '@docker.image@'
         args:
         - ozone
         - scm
-        envFrom:
-        - configMapRef:
-            name: config
+        livenessProbe:
+          tcpSocket:
+            port: 9861
+          initialDelaySeconds: 30
         env:
         - name: JAEGER_SAMPLER_TYPE
           value: probabilistic
@@ -71,6 +72,9 @@ spec:
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       volumes:
       - name: data
         emptyDir: {}
diff --git 
a/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml
index b74d58e..d3e9572 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml
@@ -55,12 +55,12 @@ spec:
         args:
         - ozone
         - datanode
-        envFrom:
-        - configMapRef:
-            name: config
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
   volumeClaimTemplates:
   - metadata:
       name: data
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml
index 6cb53e7..d35c4dd 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml
@@ -39,37 +39,27 @@ spec:
     spec:
       securityContext:
         fsGroup: 1000
-      initContainers:
-      - name: init
+      containers:
+      - name: om
         image: '@docker.image@'
         args:
         - ozone
         - om
-        - --init
         env:
         - name: WAITFOR
           value: scm-0.scm:9876
-        envFrom:
-        - configMapRef:
-            name: config
+        - name: ENSURE_OM_INITIALIZED
+          value: /data/metadata/om/current/VERSION
+        livenessProbe:
+          tcpSocket:
+            port: 9862
+          initialDelaySeconds: 30
         volumeMounts:
         - name: data
           mountPath: /data
-      containers:
-      - name: om
-        image: '@docker.image@'
-        args:
-        - ozone
-        - om
-        env:
-        - name: WAITFOR
-          value: scm-0.scm:9876
         envFrom:
         - configMapRef:
             name: config
-        volumeMounts:
-        - name: data
-          mountPath: /data
       volumes: []
   volumeClaimTemplates:
   - metadata:
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml
index 2ad951f..adc277a 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml
@@ -39,12 +39,17 @@ spec:
         args:
         - ozone
         - s3g
-        envFrom:
-        - configMapRef:
-            name: config
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 9878
+          initialDelaySeconds: 30
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
   volumeClaimTemplates:
   - metadata:
       name: data
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml 
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml
index a63c3fc..780fdd7 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml
@@ -46,24 +46,28 @@ spec:
         - ozone
         - scm
         - --init
-        envFrom:
-        - configMapRef:
-            name: config
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
       containers:
       - name: scm
         image: '@docker.image@'
         args:
         - ozone
         - scm
-        envFrom:
-        - configMapRef:
-            name: config
+        livenessProbe:
+          tcpSocket:
+            port: 9861
+          initialDelaySeconds: 30
         volumeMounts:
         - name: data
           mountPath: /data
+        envFrom:
+        - configMapRef:
+            name: config
   volumeClaimTemplates:
   - metadata:
       name: data


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to