Merge pull request #325 from iberryful/fix-gcp-svc

Refactor gcp service
SAP · Jul 25, 2019 · f94d0d9 · f94d0d9
2 parents af0f9b8 + e112d8b
commit f94d0d9
Show file tree

Hide file tree

Showing 5 changed files with 1,112 additions and 920 deletions.
diff --git a/src/services/gcp/Gopkg.lock b/src/services/gcp/Gopkg.lock
diff --git a/src/services/gcp/cmd/gcp/main.go b/src/services/gcp/cmd/gcp/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"context"
+	"os"
 	"runtime"
 	"os/exec"
 	"io/ioutil"
@@ -24,7 +25,7 @@ func printVersion() {
 func main() {
 	printVersion()
 
-    gcpserviceaccount := "/var/run/infrabox.net/gcp/service_account.json"
+	gcpserviceaccount := "/var/run/infrabox.net/gcp/service_account.json"
 
 	logrus.Info("Activating GCP service account")
 	authCmd := exec.Command("gcloud", "auth", "activate-service-account", "--key-file", gcpserviceaccount)
@@ -57,10 +58,23 @@ func main() {
 	if err != nil {
 		logrus.Fatalf("Failed to get watch gcp: %v", err)
 	}
-	resyncPeriod := 5
+	resyncPeriod := 20
 	logrus.Infof("Watching %s, %s, %s, %d", resource, kind, namespace, resyncPeriod)
 
-    logrus.SetLevel(logrus.WarnLevel)
+	logLevel := os.Getenv("LOG_LEVEL")
+
+	switch logLevel {
+	case "debug":
+		logrus.SetLevel(logrus.DebugLevel)
+	case "info":
+		logrus.SetLevel(logrus.InfoLevel)
+	case "warn":
+		logrus.SetLevel(logrus.WarnLevel)
+	case "error":
+		logrus.SetLevel(logrus.ErrorLevel)
+	default:
+		logrus.SetLevel(logrus.InfoLevel)
+	}
 
 	sdk.Watch(resource, kind, namespace, resyncPeriod)
 	sdk.Handle(stub.NewHandler())

diff --git a/src/services/gcp/infrabox-service-gcp/templates/deployment.yaml b/src/services/gcp/infrabox-service-gcp/templates/deployment.yaml
@@ -20,6 +20,10 @@ spec:
         release: {{ .Release.Name }}
     spec:
       serviceAccountName: infrabox-service-gcp
+      {{ if .Values.imagePullSecret }}
+      imagePullSecrets:
+        - name: {{ .Values.imagePullSecret }}
+      {{ end }}
       containers:
         - name: {{ .Chart.Name }}
           command: ["./gcp"]
@@ -36,6 +40,8 @@ spec:
             value: infrabox-worker
           - name: MAX_NUM_CLUSTERS
             value: {{ .Values.max_clusters | quote }}
+          - name: LOG_LEVEL
+            value: {{ .Values.log_level | quote }}
       volumes:
       - name: service-account
         secret:

diff --git a/src/services/gcp/infrabox-service-gcp/values.yaml b/src/services/gcp/infrabox-service-gcp/values.yaml
@@ -4,4 +4,9 @@ image:
   repository: quay.io/infrabox/service-gcp
   tag: latest
 
+imagePullSecret:
+
 max_clusters: 30
+
+# info | debug | warn | error
+log_level: info