From 57ebc50e02a90a76408f8c576844fc5a1a38051a Mon Sep 17 00:00:00 2001
From: Jordan Halterman <jordan.halterman@gmail.com>
Date: Mon, 13 Jul 2020 17:04:12 -0700
Subject: [PATCH] Revert "VOL-3110: Added Liveliness probe for volta-apps.
 (#102)" (#133)

* Revert "VOL-3110: Added Liveliness probe for volta-apps. (#102)"

This reverts commit 1c39b4469c93f99e3e08d56622f693354a8ed574.

* Bump onos-tost version
---
 onos-classic/Chart.yaml                       |  2 +-
 .../templates/configmap-live-probe.yaml       | 31 -------------------
 onos-classic/templates/statefulset.yaml       | 11 +------
 onos-tost/Chart.yaml                          |  2 +-
 onos-tost/requirements.yaml                   |  2 +-
 5 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 onos-classic/templates/configmap-live-probe.yaml

diff --git a/onos-classic/Chart.yaml b/onos-classic/Chart.yaml
index 88624b91..ef25b4b1 100644
--- a/onos-classic/Chart.yaml
+++ b/onos-classic/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
 name: onos-classic
-version: 0.1.2
+version: 0.1.3
 kubeVersion: ">=1.10.0"
 appVersion: 2.2.2
 description: ONOS cluster
diff --git a/onos-classic/templates/configmap-live-probe.yaml b/onos-classic/templates/configmap-live-probe.yaml
deleted file mode 100644
index 271d0884..00000000
--- a/onos-classic/templates/configmap-live-probe.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "fullname" . }}-live-probe-scripts
-  labels:
-    app: {{ template "fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-data:
-  check-onos-app-status: |
-    #!/bin/bash
-    set -e
-    live_probe () {
-        apps=$ONOS_APPS
-        IFS=',' read -ra app_array <<< "$apps"
-        for i in "${app_array[@]}"
-            do
-            file="/root/onos/apps/$i/active"
-            if [ -f "$file" ]
-            then
-                echo "app $i found"
-            else
-                echo "failed reason : app $i not found"
-                return 1
-            fi
-        done
-        return 0
-    }
-    live_probe
diff --git a/onos-classic/templates/statefulset.yaml b/onos-classic/templates/statefulset.yaml
index a6127ae3..3f56dbf0 100644
--- a/onos-classic/templates/statefulset.yaml
+++ b/onos-classic/templates/statefulset.yaml
@@ -71,8 +71,6 @@ spec:
         env:
           - name: JAVA_OPTS
             value: -Xmx{{ .Values.heap }}
-          - name: ONOS_APPS
-            value: {{ .Values.apps | quote }}
         {{- with .Values.ports }}
         ports:
         {{- range . }}
@@ -94,7 +92,7 @@ spec:
             command:
               - sh
               - -c
-              - /root/onos/bin/check-onos-app-status
+              - /root/onos/bin/check-onos-status
           initialDelaySeconds: 300
           periodSeconds: 15
           timeoutSeconds: 5
@@ -102,9 +100,6 @@ spec:
           - name: probe-scripts
             mountPath: /root/onos/bin/check-onos-status
             subPath: check-onos-status
-          - name: live-probe-scripts
-            mountPath: /root/onos/bin/check-onos-app-status
-            subPath: check-onos-app-status
           - name: config
             mountPath: /root/onos/config/cluster.json
             subPath: cluster.json
@@ -128,9 +123,5 @@ spec:
           configMap:
             name: {{ template "fullname" . }}-probe-scripts
             defaultMode: 0744
-        - name: live-probe-scripts
-          configMap:
-            name: {{ template "fullname" . }}-live-probe-scripts
-            defaultMode: 0744
         - name: config
           emptyDir: {}
diff --git a/onos-tost/Chart.yaml b/onos-tost/Chart.yaml
index 4d3a151d..80ed89f0 100644
--- a/onos-tost/Chart.yaml
+++ b/onos-tost/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
 name: onos-tost
-version: 0.1.3
+version: 0.1.4
 kubeVersion: ">=1.10.0"
 appVersion: 2.2.3
 description: ONOS TOST
diff --git a/onos-tost/requirements.yaml b/onos-tost/requirements.yaml
index 147e2a70..bda0703a 100644
--- a/onos-tost/requirements.yaml
+++ b/onos-tost/requirements.yaml
@@ -1,5 +1,5 @@
 ---
 dependencies:
 - name: onos-classic
-  version: 0.1.2
+  version: 0.1.3
   repository: https://charts.onosproject.org