K8S-587 fix gitlab action

Author: dfateyev

addons/gitlab/gitlab-integration-remove.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+if [ ! -f "/var/lib/kubelet/kubeadm-flags.env" ]; then
+
+	echo -e "Kubernetes worker configuration is invalid"
+	exit 1
+fi
+
 if [ ! -f "/var/lib/worker/gitlab-integration.conf" ]; then
 
 	echo "$(date): Gitlab integration configuration is missing"
@@ -8,7 +14,15 @@ fi
 
 source /var/lib/worker/gitlab-integration.conf
 
-rm -rf "/etc/docker/certs.d/${GITLAB_REGISTRY}" &>/dev/null
+if grep -q 'containerd' /var/lib/kubelet/kubeadm-flags.env; then
+
+	rm -rf /etc/pki/ca-trust/source/anchors/gitlab-registry.crt &>/dev/null
+	/bin/update-ca-trust
+	service containerd restart
+
+else
+	rm -rf "/etc/docker/certs.d/${GITLAB_REGISTRY}" &>/dev/null
+fi
 
 echo "$(date): Gitlab integration configuration removed"
 

addons/gitlab/gitlab-integration.sh

@@ -1,21 +1,35 @@
 #!/bin/bash
 
+if [ ! -f "/var/lib/kubelet/kubeadm-flags.env" ]; then
+
+	echo -e "Kubernetes worker configuration is invalid"
+	exit 1
+fi
+
 if [ ! -f "/var/lib/worker/gitlab-cacert.crt" ]; then
 
 	echo -e "Gitlab integration certificate doesn't exist"
-	exit 1
+	exit 2
 fi
+
 if [ ! -f "/var/lib/worker/gitlab-integration.conf" ]; then
 
 	echo -e "Gitlab integration configuration is missing"
-	exit 2
+	exit 3
 fi
 
 source /var/lib/worker/gitlab-integration.conf
 
-mkdir -p "/etc/docker/certs.d/${GITLAB_REGISTRY}" &>/dev/null
+if grep -q 'containerd' /var/lib/kubelet/kubeadm-flags.env; then
 
-/usr/bin/cp -f /var/lib/worker/gitlab-cacert.crt "/etc/docker/certs.d/${GITLAB_REGISTRY}/ca.crt"
+	/usr/bin/cp -f /var/lib/worker/gitlab-cacert.crt /etc/pki/ca-trust/source/anchors/gitlab-registry.crt
+	/bin/update-ca-trust
+	service containerd restart
+
+else
+	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"
+fi
 
 echo -e "Gitlab integration configuration complete"
 

manifest.jps

@@ -124,7 +124,6 @@ onAfterScaleOut:
       - set:
           nodes: ${event.response.nodes.join(id,)}
           ips: ${event.response.nodes.join(extIPs,)}
-      - prepare-worker-integration
       - cmd [${this.nodes}]: init-instance.sh --type=worker --initial=true --base-url=$(echo '${baseUrl}' | base64 -w 0)
       - connect-workers: ${this.nodes}
       - apply-worker-config:
@@ -218,18 +217,20 @@ actions:
     user: root
     sync: false
 
-  prepare-worker-integration:
+  apply-worker-integration:
     - cmd[${nodes.k8sm.master.id}]: tar zcfv - /var/lib/kubelet/worker-data 2>/dev/null | base64 -w 0
-    - setGlobals:
+    - set:
         worker_integration: ${response.out}
-
-  apply-worker-config:
-    - cmd[${nodes.k8sm.master.id}]: screen -d -m /usr/local/sbin/worker-config -n ${this.nodes} -g ${this.group} -r ${env.region}
     - cmd[${this.nodes}]: |-
         mkdir /var/lib/worker &>/dev/null || rm -rf /var/lib/worker/*
-        echo '${globals.worker_integration}' | base64 -d | tar zxv --strip-components=4 -C /var/lib/worker
+        echo '${this.worker_integration}' | base64 -d | tar zxv --strip-components=4 -C /var/lib/worker
         screen -d -m /usr/bin/bash -c '/usr/local/sbin/worker-integration.sh &>/var/log/kubernetes/k8s-worker-integration.log'
 
+  apply-worker-config:
+    - cmd[${nodes.k8sm.master.id}]: screen -d -m /usr/local/sbin/worker-config -n ${this.nodes} -g ${this.group} -r ${env.region}
+    - apply-worker-integration:
+        nodes: ${this.nodes}
+
   init-main-master:
     - if (${nodes.mbl.length:0}):
         cmd[mbl]: |-
@@ -255,7 +256,6 @@ actions:
     - cmd[${nodes.k8sm.master.id}]: sed -n '/kubeadm join/,/^$/{/./p}' /var/log/kubeadm-init.log | sed ':a;N;$!ba;s/\\\n//g' | grep -v 'control-plane'
     - setGlobals:
         worker_join_cmd: ${response.out}
-    - prepare-worker-integration
 
   init-slave-masters:
     - script: |
@@ -901,7 +901,7 @@ addons:
             csrf_token=$(echo ${page_content} | perl -ne 'print "$1\n" if /new_cluster.*?authenticity_token"[[:blank:]]value="(.+?)"/' | sed -n 1p)
             echo "Add cluster CSRF token: ${csrf_token}"
             [ -n "${csrf_token}" ] || continue
-            page_content=$(curl -X POST -sk -b gitlab-jar.txt -c gitlab-jar.txt -d "cluster[name]=Kubernetes&cluster[platform_kubernetes_attributes][authorization_type]=rbac&cluster[managed]=1" --data-urlencode "cluster[platform_kubernetes_attributes][api_url]=${this.gitlab_api_url}" --data-urlencode "cluster[platform_kubernetes_attributes][ca_cert]=${this.gitlab_ca_cert}" --data-urlencode "cluster[platform_kubernetes_attributes][token]=${this.gitlab_token}" --data-urlencode "authenticity_token=${csrf_token}" '${this.gitlab_http_endpoint}/admin/clusters/create_user')
+            page_content=$(curl -X POST -sk -b gitlab-jar.txt -c gitlab-jar.txt -d "cluster[name]=Kubernetes&cluster[platform_kubernetes_attributes][authorization_type]=rbac&cluster[managed]=1&cluster[namespace_per_environment]=1" --data-urlencode "cluster[platform_kubernetes_attributes][api_url]=${this.gitlab_api_url}" --data-urlencode "cluster[platform_kubernetes_attributes][ca_cert]=${this.gitlab_ca_cert}" --data-urlencode "cluster[platform_kubernetes_attributes][token]=${this.gitlab_token}" --data-urlencode "authenticity_token=${csrf_token}" '${this.gitlab_http_endpoint}/admin/clusters/create_user')
             cluster_url=$(echo ${page_content} | perl -ne 'print "$1\n" if /You[[:blank:]]are[[:blank:]]being[[:blank:]]\<a[[:blank:]]href="(.+?)"\>redirected/' | sed -n 1p)
             echo "Kubernetes GitLab cluster: ${cluster_url}"
             [ -n "${cluster_url}" ] && break || continue
@@ -929,9 +929,9 @@ addons:
           echo 'GITLAB_REGISTRY="${this.gitlab_domain}:${this.gitlab_reg_port}"' > /var/lib/kubelet/worker-data/gitlab-integration.conf
           wget -nv ${baseUrl}/addons/gitlab/gitlab-integration.sh -O /var/lib/kubelet/worker-data/gitlab-integration.sh
           chmod +x /var/lib/kubelet/worker-data/gitlab-integration.sh
-      - prepare-worker-integration
       - init-globals-workers
-      - apply-worker-integration: ${globals.workers}
+      - apply-worker-integration:
+          nodes: ${globals.workers}
 
       addon-gitlab-remove:
       - cmd[${nodes.k8sm.master.id}]: kubectl get ns gitlab-managed-apps &>/dev/null && echo "true" || echo "false"