change user setting in openshift centos image to be compliant with openshift container policy

1 files changed, 2 insertions, 32 deletions

diff --git a/OS/sx.sh b/OS/sx.sh
index 96a8448..5bf4d17 100644
--- a/OS/sx.sh
+++ b/OS/sx.sh
@@ -1,41 +1,13 @@
 #!/bin/bash
 export TERM=xterm
 pid=0
-printenv
-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 "+====================================================="
 }
 
@@ -49,7 +21,5 @@ function start_service {
     done
 }
 
-
-check_environment
 display_container_header
 start_service
\ No newline at end of file