From a46fbf0ec92d15af5a43261417571facf3c80d79 Mon Sep 17 00:00:00 2001
From: Ilia Eriomenco <ilia.eriomenco@endava.com>
Date: Wed, 14 Apr 2021 14:46:31 +0300
Subject: [PATCH] ci: add 'kubectl config' in k8s deploy

---
 .gitlab-ci.elife.k8s.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.elife.k8s.yml b/.gitlab-ci.elife.k8s.yml
index d936f362de..b52ec6dd5f 100644
--- a/.gitlab-ci.elife.k8s.yml
+++ b/.gitlab-ci.elife.k8s.yml
@@ -37,8 +37,8 @@ stages:
 
 deploy:
   stage: deploy
-  #image: jshimko/kube-tools-aws:latest
-  image: ubuntu:18.04
+  image: jshimko/kube-tools-aws:latest
+  #image: ubuntu:18.04
   variables:
     AWS_ACCESS_KEY_ID: $ELIFE_AWS_ACCESS_KEY_ID
     AWS_SECRET_ACCESS_KEY: $ELIFE_AWS_SECRET_ACCESS_KEY
@@ -50,16 +50,16 @@ deploy:
   #   - echo "${ELIFE_K8S_CLUSTER_CONFIG}" >> ~/.elife_k8s_config
   script:
       - |
-        ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-        apt update
-        apt install awscli curl wget -y
-        curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
-        chmod +x ./kubectl
-        mv ./kubectl /usr/local/bin/kubectl
-        aws --version
-        kubectl version
+        #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+        #apt update
+        #apt install awscli curl wget -y
+        #curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
+        #chmod +x ./kubectl
+        #mv ./kubectl /usr/local/bin/kubectl
+        #aws --version
+        kubectl config --kubeconfig=$ELIFE_CLUSTER_NAME set-cluster $ELIFE_CLUSTER_NAME --server=${ELIFE_K8S_CLUSTER_HOST} --certificate-authority=${ELIFE_K8S_CLUSTER_CA_CERTIFICATE}
         #aws --region=$AWS_DEFAULT_REGION eks update-kubeconfig --name $ELIFE_CLUSTER_NAME
-        #kubectl cluster-info
+        kubectl cluster-info
         # helm repo add kotahi https://charts.bitnami.com/bitnami
         # helm dependency build helm/elife-kotahi
         # helm upgrade -i elife-kotahi \
-- 
GitLab