From 33a9d25159d12b8253b471777b20ae10bf6d3f73 Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <manuel.kieweg@h-da.de>
Date: Wed, 31 Mar 2021 16:02:31 +0100
Subject: [PATCH] add docker image and token
---
build/cd/deploy.go | 6 +++---
build/ci/.deploy-k8s.yml | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/build/cd/deploy.go b/build/cd/deploy.go
index f14d1604a..3f08492df 100644
--- a/build/cd/deploy.go
+++ b/build/cd/deploy.go
@@ -10,17 +10,17 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
- "k8s.io/client-go/util/homedir"
"log"
"os"
- "path/filepath"
)
func main() {
- kubeconfig, err := clientcmd.BuildConfigFromFlags("", filepath.Join(homedir.HomeDir(), ".kube", "config"))
+ kubeconfig, err := clientcmd.BuildConfigFromFlags("https://api.ocp.fbi.h-da.de:6443", "")
if err != nil {
log.Fatal(err)
}
+ kubeconfig.Username = os.Getenv("K8S_DEPLOY_USER")
+ kubeconfig.BearerToken = os.Getenv("K8S_DEPLOY_TOKEN")
clientset, err := kubernetes.NewForConfig(kubeconfig)
if err != nil {
log.Fatal(err)
diff --git a/build/ci/.deploy-k8s.yml b/build/ci/.deploy-k8s.yml
index 8a4540803..dffd5977f 100644
--- a/build/ci/.deploy-k8s.yml
+++ b/build/ci/.deploy-k8s.yml
@@ -9,6 +9,7 @@ build:
- ./k8s-bot
.deploy: &deploy
+ image: bitnami/kubectl:latest
variables:
K8S_OP: "create"
script:
@@ -31,6 +32,7 @@ deploy:develop:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
destroy:
+ image: bitnami/kubectl:latest
stage: .post
variables:
K8S_OP: "delete"
--
GitLab