K8S-372 improve worker integration logging

Author: dfateyev

addons/gitlab/gitlab-integration-remove.sh

@@ -2,12 +2,14 @@
 
 if [ ! -f "/var/lib/worker/gitlab-integration.conf" ]; then
 
-	echo -e "Integration configuration is missing"
+	echo "$(date): Gitlab integration configuration is missing"
 	exit 2
 fi
 
 source /var/lib/worker/gitlab-integration.conf
 
 rm -rf "/etc/docker/certs.d/${GITLAB_REGISTRY}" &>/dev/null
 
+echo "$(date): Gitlab integration configuration removed"
+
 exit 0

addons/gitlab/gitlab-integration.sh

@@ -2,12 +2,12 @@
 
 if [ ! -f "/var/lib/worker/gitlab-cacert.crt" ]; then
 
-	echo -e "Integration certificate doesn't exist"
+	echo -e "Gitlab integration certificate doesn't exist"
 	exit 1
 fi
 if [ ! -f "/var/lib/worker/gitlab-integration.conf" ]; then
 
-	echo -e "Integration configuration is missing"
+	echo -e "Gitlab integration configuration is missing"
 	exit 2
 fi
 
@@ -17,4 +17,6 @@ mkdir -p "/etc/docker/certs.d/${GITLAB_REGISTRY}" &>/dev/null
 
 /usr/bin/cp -f /var/lib/worker/gitlab-cacert.crt "/etc/docker/certs.d/${GITLAB_REGISTRY}/ca.crt"
 
+echo -e "Gitlab integration configuration complete"
+
 exit 0

manifest.jps

@@ -441,7 +441,7 @@ addons:
           caption: Remote API access is enabled
         - type: string
           name: ingress-controller
-          inputType: hidden        
+          inputType: hidden
         - type: string
           name: storage
           inputType: hidden
@@ -776,7 +776,7 @@ addons:
       - cmd[cp]: |-
           wget -nv ${baseUrl}/addons/gitlab/gitlab-integration-remove.sh -O /var/lib/worker/gitlab-integration-remove.sh
           chmod +x /var/lib/worker/gitlab-integration-remove.sh
-          /var/lib/worker/gitlab-integration-remove.sh
+          /var/lib/worker/gitlab-integration-remove.sh | tee -a /var/log/kubernetes/k8s-worker-integration.log
           rm -f /var/lib/worker/gitlab-*
 
   - id: certman-k8s-addon

scripts/worker-integration.sh

@@ -3,7 +3,7 @@
 
 if [ ! -d "/var/lib/worker" ]; then
 
-	echo -e "Worker integration directory doesn't exist"
+	echo "$(date): worker integration directory doesn't exist"
 	exit 1
 fi