Merge pull request #8 from CSID-DGU/develop

[deploy] develop -> main : /report-background 테스트 배포

Author: pkhyrn268

bash_logout_test bash.bash_logoutbash_logout_test renamed to bash.bash_logout

@@ -6,7 +6,7 @@
 # Custom Logout Hooks - Add your extended functionality here
 # ============================================================================
 # Create log directory in persistent storage
-log_dir="/kube_logs/.containerssh_logs"
+log_dir="$HOME/.kube_logs"
 mkdir -p "$log_dir"
 
 # Log file path

bashrc_test bashrcbashrc_test renamed to bashrc

@@ -6,6 +6,9 @@ case $- in
       *) return;;
 esac
 
+# Create log directory early
+mkdir -p $HOME/.kube_logs
+
 # Basic bash settings
 export HISTCONTROL=ignoreboth
 export HISTSIZE=1000
@@ -44,7 +47,7 @@ run_logout_once() {
     # Atomic creation using noclobber so only the first caller succeeds
     ( set -o noclobber; echo "$$ $(date +%s)" > "$lock" ) 2>/dev/null || {
         # Already executed once for this session; just return
-        echo "$(kst_date): logout already executed once for SID=${sid} (lock=${lock})" >> /kube_logs/.containerssh_logs/monitor.log
+        echo "$(kst_date): logout already executed once for SID=${sid} (lock=${lock})" >> $HOME/.kube_logs/monitor.log
         return 0
     }
 
@@ -75,7 +78,7 @@ safe_logout() {
 # -----------------------------------------------------------------------------
 # Set up traps with run-once guard via safe_logout
 # -----------------------------------------------------------------------------
-trap 'echo "$(kst_date): EXIT trap triggered for PID $$" >> /kube_logs/.containerssh_logs/monitor.log; ORIGINAL_PID=$$ safe_logout $$' EXIT
+trap 'echo "$(kst_date): EXIT trap triggered for PID $$" >> $HOME/.kube_logs/monitor.log; ORIGINAL_PID=$$ safe_logout $$' EXIT
 
 # Test trap that won't block
 test_trap() {
@@ -119,9 +122,9 @@ ssh_session_monitor() {
     export SESSION_ID="$session_id"
 
     # Create persistent monitor log directory
-    mkdir -p "/kube_logs/.containerssh_logs"
+    mkdir -p "$HOME/.kube_logs"
     # Use fixed filename that continues across pod restarts
-    local monitor_log="/kube_logs/.containerssh_logs/monitor.log"
+    local monitor_log="$HOME/.kube_logs/monitor.log"
 
     # Prevent multiple monitors for the same PID
     if [ -f "/tmp/monitor_active_${main_bash_pid}" ]; then
@@ -203,7 +206,7 @@ ssh_session_monitor() {
     disown $!
 
     # Store the monitor info
-    echo "Monitor started for session $session_id at $(kst_date)" > "/kube_logs/.containerssh_logs/monitor_${session_id}.info"
+    echo "Monitor started for session $session_id at $(kst_date)" > "$HOME/.kube_logs/monitor_${session_id}.info"
 }
 
 # Start monitoring when bash starts (only for interactive shells)
@@ -224,10 +227,10 @@ check_session() {
 PROMPT_COMMAND="check_session"
 
 # Useful monitoring commands
-alias monitor_status='echo "=== Persistent monitor files ==="; ls -la /kube_logs/.containerssh_logs/monitor_* 2>/dev/null; echo "=== Temp session files ==="; ls -la /tmp/monitor_active_* /tmp/ssh_session_* 2>/dev/null || echo "No temp files found"'
-alias cleanup_old_monitors='echo "Persistent logs:"; ls -la /kube_logs/.containerssh_logs/monitor_* 2>/dev/null; echo "Temp files:"; find /tmp -name "monitor_*" -o -name "ssh_session_*" -o -name "session_active_*" | xargs ls -la 2>/dev/null; echo "Use: rm /kube_logs/.containerssh_logs/monitor_* /tmp/monitor_* /tmp/ssh_session_* /tmp/session_active_* to clean up"'
-alias monitor_log='cat /kube_logs/.containerssh_logs/monitor.log 2>/dev/null || echo "No monitor log found"'
-alias logout_log='ls -la /kube_logs/.containerssh_logs/ 2>/dev/null && cat /kube_logs/.containerssh_logs/logout.log 2>/dev/null || echo "No logout logs found"'
+alias monitor_status='echo "=== Persistent monitor files ==="; ls -la $HOME/.kube_logs/monitor_* 2>/dev/null; echo "=== Temp session files ==="; ls -la /tmp/monitor_active_* /tmp/ssh_session_* 2>/dev/null || echo "No temp files found"'
+alias cleanup_old_monitors='echo "Persistent logs:"; ls -la $HOME/.kube_logs/monitor_* 2>/dev/null; echo "Temp files:"; find /tmp -name "monitor_*" -o -name "ssh_session_*" -o -name "session_active_*" | xargs ls -la 2>/dev/null; echo "Use: rm $HOME/.kube_logs/monitor_* /tmp/monitor_* /tmp/ssh_session_* /tmp/session_active_* to clean up"'
+alias monitor_log='cat $HOME/.kube_logs/monitor.log 2>/dev/null || echo "No monitor log found"'
+alias logout_log='ls -la $HOME/.kube_logs/ 2>/dev/null && cat $HOME/.kube_logs/logout.log 2>/dev/null || echo "No logout logs found"'
 alias session_info='echo "Current PID: $$, PPID: $(ps -o ppid= -p $$), Terminal: $([ -t 0 ] && echo "Connected" || echo "Disconnected")"'
 alias timezone_info='echo "System time: $(date)"; echo "UTC time: $(date -u)"; echo "KST attempt: $(kst_date)"; ls -la /usr/share/zoneinfo/Asia/Seoul 2>/dev/null || echo "Seoul timezone file not found"'
 

bashrc_test3

@@ -0,0 +1,30 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: config-server-role
+  namespace: {{ .Values.config.namespace }}
+  labels:
+    app: containerssh-config-server
+rules:
+- apiGroups: [""]
+  resources: ["pods", "pods/exec", "pods/log", "services"]
+  verbs: ["get", "list", "watch", "create", "delete", "patch"]
+- apiGroups: [""]
+  resources: ["persistentvolumeclaims"]
+  verbs: ["get", "list", "create", "delete", "patch", "update"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: config-server-rolebinding
+  namespace: {{ .Values.config.namespace }}
+  labels:
+    app: containerssh-config-server
+subjects:
+- kind: ServiceAccount
+  name: config-server
+  namespace: {{ .Values.config.namespace }}
+roleRef:
+  kind: Role
+  name: config-server-role
+  apiGroup: rbac.authorization.k8s.io

config-server/Chart/templates/rbac.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: config-server
+  namespace: {{ .Values.config.namespace }}
+  labels:
+    app: containerssh-config-server

config-server/Chart/templates/serviceaccount.yaml

@@ -33,6 +33,7 @@
     get_group_members_home_volumes,
     select_best_node_from_prometheus,
     load_user_image,
+    commit_and_save_user_image,
     create_nodeport_services,
     delete_nodeport_services,
 )