From 11621aff584557c0141cef87b6e229f382349e9e Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sun, 23 Jul 2017 14:23:43 +0200
Subject: change user setting in openshift centos image to be compliant with
 openshift container policy

---
 Bombs/cpu/sx.sh | 34 ++--------------------------------
 Bombs/mem/sx.sh | 34 ++--------------------------------
 2 files changed, 4 insertions(+), 64 deletions(-)

(limited to 'Bombs')

diff --git a/Bombs/cpu/sx.sh b/Bombs/cpu/sx.sh
index 2f2607a..e028787 100644
--- a/Bombs/cpu/sx.sh
+++ b/Bombs/cpu/sx.sh
@@ -2,40 +2,12 @@
 export TERM=xterm
 pid=0
 
-function check_environment {
-    if [ ! -v CONTAINER_TYPE ]; then
-        CONTAINER_TYPE="unknown"
-        export CONTAINER_TYPE
-        echo "! WARNING : environment var CONTAINER_TYPE is missing..."
-        echo "! WARNING : auto-assigned value : $CONTAINER_TYPE"
-    fi
-    if [ ! -v CONTAINER_SERVICE ]; then
-        CONTAINER_SERVICE=$CONTAINER_TYPE;
-        export CONTAINER_SERVICE;
-        echo "! WARNING : environment var CONTAINER_SERVICE is missing..."
-        echo "! WARNING : auto-assigned value : $CONTAINER_SERVICE"
-    fi
-    if [ ! -v CONTAINER_INSTANCE ]; then
-        CONTAINER_INSTANCE=$CONTAINER_TYPE "_" $CONTAINER_SERVICE;
-        export CONTAINER_INSTANCE;
-        echo "! WARNING : environment var CONTAINER_INSTANCE is missing..."
-        echo "! WARNING : auto-assigned value : $CONTAINER_INSTANCE"
-    fi
-}
-
 function display_container_header {
     echo "+====================================================="
     echo "| Container   : $HOSTNAME"
     echo "| OS          : $(</etc/redhat-release)"
-    if [ -v CONTAINER_TYPE ]; then
-        echo "| Type        : $CONTAINER_TYPE"
-    fi
-    if [ -v CONTAINER_SERVICE ]; then
-        echo "| Service     : $CONTAINER_SERVICE"
-    fi
-    if [ -v CONTAINER_INSTANCE ]; then
-        echo "| Instance    : $CONTAINER_INSTANCE"
-    fi
+    echo "| kubernetes  : $KUBERNETES_SERVICE_HOST"
+    echo "| user        : $(</etc/whoami)"
     echo "+====================================================="
 }
 
@@ -59,7 +31,5 @@ function start_service {
     exit 0
 }
 
-
-check_environment
 display_container_header
 start_service
\ No newline at end of file
diff --git a/Bombs/mem/sx.sh b/Bombs/mem/sx.sh
index fd9115e..f607a0f 100644
--- a/Bombs/mem/sx.sh
+++ b/Bombs/mem/sx.sh
@@ -2,40 +2,12 @@
 export TERM=xterm
 pid=0
 
-function check_environment {
-    if [ ! -v CONTAINER_TYPE ]; then
-        CONTAINER_TYPE="unknown"
-        export CONTAINER_TYPE
-        echo "! WARNING : environment var CONTAINER_TYPE is missing..."
-        echo "! WARNING : auto-assigned value : $CONTAINER_TYPE"
-    fi
-    if [ ! -v CONTAINER_SERVICE ]; then
-        CONTAINER_SERVICE=$CONTAINER_TYPE;
-        export CONTAINER_SERVICE;
-        echo "! WARNING : environment var CONTAINER_SERVICE is missing..."
-        echo "! WARNING : auto-assigned value : $CONTAINER_SERVICE"
-    fi
-    if [ ! -v CONTAINER_INSTANCE ]; then
-        CONTAINER_INSTANCE=$CONTAINER_TYPE "_" $CONTAINER_SERVICE;
-        export CONTAINER_INSTANCE;
-        echo "! WARNING : environment var CONTAINER_INSTANCE is missing..."
-        echo "! WARNING : auto-assigned value : $CONTAINER_INSTANCE"
-    fi
-}
-
 function display_container_header {
     echo "+====================================================="
     echo "| Container   : $HOSTNAME"
     echo "| OS          : $(</etc/redhat-release)"
-    if [ -v CONTAINER_TYPE ]; then
-        echo "| Type        : $CONTAINER_TYPE"
-    fi
-    if [ -v CONTAINER_SERVICE ]; then
-        echo "| Service     : $CONTAINER_SERVICE"
-    fi
-    if [ -v CONTAINER_INSTANCE ]; then
-        echo "| Instance    : $CONTAINER_INSTANCE"
-    fi
+    echo "| kubernetes  : $KUBERNETES_SERVICE_HOST"
+    echo "| user        : $(</etc/whoami)"
     echo "+====================================================="
 }
 
@@ -59,7 +31,5 @@ function start_service {
     exit 0
 }
 
-
-check_environment
 display_container_header
 start_service
\ No newline at end of file
-- 
cgit v1.2.1