Adding Dockerfile for each component + helm for executor

.circleci/config.yml

@@ -16,11 +16,13 @@ jobs:
     #### expecting it in the form of
     ####   /go/src/github.com/circleci/go-tool
     ####   /go/src/bitbucket.org/circleci/go-tool
-    working_directory: /go/src/github.com/{{ORG_NAME}}/{{REPO_NAME}}
+    working_directory: /go/src/github.com/G-Research/k8s-batch
     steps:
       - checkout
+      - setup_remote_docker
 
       # specify any bash command here prefixed with `run: `
       - run: go get -v -d ./...
       - run: go test -v ./...
       - run: exit $(gofmt -l . | wc -l)
+      - run: docker build -t executor:${CIRCLE_SHA1} -f ./build/executor/Dockerfile .

build/armada/Dockerfile

@@ -0,0 +1,19 @@
+FROM golang:1.12.6 as builder
+
+RUN mkdir /app
+
+ADD . /app
+
+WORKDIR /app
+
+RUN env GOOS=linux GARCH=amd64 CGO_ENABLED=0 go build -o main cmd/armada/main.go
+
+FROM alpine:3.10
+
+COPY --from=builder /app/main /app/
+
+COPY --from=builder /app/config /app/config
+
+WORKDIR /app
+
+ENTRYPOINT ["./main"]

build/executor/Dockerfile

@@ -0,0 +1,19 @@
+FROM golang:1.12.6 as builder
+
+RUN mkdir /app
+
+ADD . /app
+
+WORKDIR /app
+
+RUN env GOOS=linux GARCH=amd64 CGO_ENABLED=0 go build -o main cmd/executor/main.go
+
+FROM alpine:3.10
+
+COPY --from=builder /app/main /app/
+
+COPY --from=builder /app/config /app/config
+
+WORKDIR /app
+
+ENTRYPOINT ["./main"]

cmd/armada/main.go

@@ -5,16 +5,27 @@ import (
 	"github.com/G-Research/k8s-batch/internal/armada/configuration"
 	"github.com/G-Research/k8s-batch/internal/common"
 	log "github.com/sirupsen/logrus"
+	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
 	"os"
 	"os/signal"
 	"syscall"
 )
 
-func main() {
+const CustomConfigLocation string = "config"
+
+func init() {
+	pflag.String(CustomConfigLocation, "", "Fully qualified path to application configuration file")
+	pflag.Parse()
+}
 
+func main() {
 	common.ConfigureLogging()
+	common.BindCommandlineArguments()
+
 	var config configuration.ArmadaConfig
-	common.LoadConfig(&config, "./config/armada")
+	userSpecifiedConfig := viper.GetString(CustomConfigLocation)
+	common.LoadConfig(&config, "./config/armada", userSpecifiedConfig)
 
 	log.Info("Starting...")
 

cmd/executor/main.go

@@ -4,16 +4,28 @@ import (
 	"github.com/G-Research/k8s-batch/internal/common"
 	"github.com/G-Research/k8s-batch/internal/executor"
 	"github.com/G-Research/k8s-batch/internal/executor/configuration"
+	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
 	"os"
 	"os/signal"
 	"syscall"
 )
 
-func main() {
+const CustomConfigLocation string = "config"
+const InCluster string = "inCluster"
+const KubeConfig string = "kubeConfigPath"
+
+func init() {
+	pflag.String(CustomConfigLocation, "", "Fully qualified path to application configuration file")
+	pflag.Bool(InCluster, false, "When set executor will run using in cluster client connection details")
+	pflag.String(KubeConfig, "", "Fully qualified path to custom kube config file")
+	pflag.Parse()
+}
 
+func main() {
 	common.ConfigureLogging()
-	var config configuration.ExecutorConfiguration
-	common.LoadConfig(&config, "./config/executor")
+	common.BindCommandlineArguments()
+	config := loadConfig()
 
 	shutdownChannel := make(chan os.Signal, 1)
 	signal.Notify(shutdownChannel, syscall.SIGINT, syscall.SIGTERM)
@@ -25,3 +37,18 @@ func main() {
 	}()
 	wg.Wait()
 }
+
+func loadConfig() configuration.ExecutorConfiguration {
+	var config configuration.ExecutorConfiguration
+	userSpecifiedConfig := viper.GetString(CustomConfigLocation)
+	common.LoadConfig(&config, "./config/executor", userSpecifiedConfig)
+
+	inClusterDeployment := viper.GetBool(InCluster)
+	customKubeConfigLocation := viper.GetString(KubeConfig)
+
+	config.Kubernetes = configuration.KubernetesConfiguration{
+		InClusterDeployment:      inClusterDeployment,
+		KubernetesConfigLocation: customKubeConfigLocation,
+	}
+	return config
+}

config/executor/config.yaml

@@ -1,6 +1,5 @@
 application:
   clusterId : "Cluster1"
-  inClusterDeployment: false
 task:
   utilisationReportingInterval: 10s
   missingJobEventReconciliationInterval: 10s

deployment/executor/Chart.yaml

@@ -0,0 +1,4 @@
+appVersion : v1
+description: A helm chart for armada-executor component
+name: executor
+version: 0.0.1

deployment/executor/templates/_helpers.tpl

@@ -0,0 +1,35 @@
+
+{{- define "executor.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "executor.config.name" -}}
+{{- printf "%s-%s" ( include "executor.name" .) "config" -}}
+{{- end }}
+
+{{- define "executor.application.config.filename" -}}
+{{- printf "%s%s" ( include "executor.config.name" .) ".yaml" -}}
+{{- end }}
+
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "executor.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "executor.labels.identity" -}}
+app: {{ include "executor.name" . }}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "executor.labels.all" -}}
+{{ include "executor.labels.identity" . }}
+chart: {{ include "executor.chart" . }}
+release: {{ .Release.Name }}
+{{- end -}}
+
+

deployment/executor/templates/clusterrole.yaml

@@ -0,0 +1,29 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "executor.name" . }}
+  labels:
+{{ include "executor.labels.all" . | indent 4 }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - delete
+  - deletecollection
+  - patch
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
+

deployment/executor/templates/clusterrolebinding.yaml

@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "executor.name" . }}
+  labels:
+{{ include "executor.labels.all" . | indent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "executor.name" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "executor.name" . }}
+  namespace:  {{ .Release.Namespace }}
+

deployment/executor/templates/configmap.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "executor.config.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "executor.labels.all" . | indent 4 }}
+data:
+  {{ include "executor.application.config.filename" . }}: |
+{{- if .Values.applicationConfig }}
+{{ toYaml .Values.applicationConfig | indent 4 }}
+{{- end }}

deployment/executor/templates/deployment.yaml

@@ -0,0 +1,38 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "executor.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "executor.labels.all" . | indent 4 }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+{{ include "executor.labels.identity" . | indent 6 }}
+  template:
+    metadata:
+      name: {{ include "executor.name" . }}
+      labels:
+{{ include "executor.labels.all" . | indent 8 }}
+    spec:
+      terminationGracePeriodSeconds: {{ .Values.executor.terminationGracePeriodSeconds }}
+      serviceAccountName: {{ include "executor.name" . }}
+      containers:
+        - name: executor
+          imagePullPolicy: IfNotPresent
+          image: {{ .Values.executor.image.repository }}:{{ required "A value is required for .Values.executor.image.tag" .Values.executor.image.tag }}
+          args:
+            - --config
+            - /config/application_config.yaml
+            - --inCluster
+          resources:
+{{ toYaml .Values.executor.resources | indent 12 }}
+          volumeMounts:
+            - name: user-config
+              mountPath: /config/application_config.yaml
+              subPath: {{ include "executor.application.config.filename" . }}
+      volumes:
+        - name: user-config
+          configMap:
+            name: {{ include "executor.config.name" . }}

deployment/executor/templates/namespace.yaml

@@ -0,0 +1,6 @@
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: {{ .Release.Namespace }}
+  labels:
+{{ include "executor.labels.all" . | indent 4 }}

deployment/executor/templates/serviceaccount.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "executor.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "executor.labels.all" . | indent 4 }}

deployment/executor/values.yaml

@@ -0,0 +1,14 @@
+executor:
+  image:
+    repository: executor-test
+    tag: latest
+  resources:
+    limits:
+      memory: 1Gi
+      cpu: 300m
+    requests:
+      memory: 512Mi
+      cpu: 200m
+  terminationGracePeriodSeconds: 0
+
+applicationConfig:

go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/kjk/betterguid v0.0.0-20170621091430-c442874ba63a
 	github.com/oklog/ulid v1.3.1
 	github.com/sirupsen/logrus v1.2.0
+	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.3.0
 	github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036 // indirect

internal/common/startup.go

@@ -2,17 +2,37 @@ package common
 
 import (
 	log "github.com/sirupsen/logrus"
+	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"os"
 )
 
-func LoadConfig(config interface{}, path string) {
+func BindCommandlineArguments() {
+	err := viper.BindPFlags(pflag.CommandLine)
+	if err != nil {
+		log.Error()
+		os.Exit(-1)
+	}
+}
+
+func LoadConfig(config interface{}, defaultPath string, overrideConfig string) {
 	viper.SetConfigName("config")
-	viper.AddConfigPath(path)
+	viper.AddConfigPath(defaultPath)
 	if err := viper.ReadInConfig(); err != nil {
 		log.Error(err)
 		os.Exit(-1)
 	}
+
+	if overrideConfig != "" {
+		viper.SetConfigFile(overrideConfig)
+
+		err := viper.MergeInConfig()
+		if err != nil {
+			log.Error(err)
+			os.Exit(-1)
+		}
+	}
+
 	err := viper.Unmarshal(config)
 	if err != nil {
 		log.Error(err)

internal/executor/application.go

@@ -18,7 +18,7 @@ import (
 )
 
 func StartUp(config configuration.ExecutorConfiguration) (func(), *sync.WaitGroup) {
-	kubernetesClient, err := CreateKubernetesClientWithDefaultConfig(config.Application.InClusterDeployment)
+	kubernetesClient, err := CreateKubernetesClient(&config.Kubernetes)
 	if err != nil {
 		log.Errorf("Failed to connect to kubernetes because %s", err)
 		os.Exit(-1)

internal/executor/configuration/types.go

@@ -3,8 +3,12 @@ package configuration
 import "time"
 
 type ApplicationConfiguration struct {
-	ClusterId           string
-	InClusterDeployment bool
+	ClusterId string
+}
+
+type KubernetesConfiguration struct {
+	InClusterDeployment      bool
+	KubernetesConfigLocation string
 }
 
 type TaskConfiguration struct {
@@ -24,6 +28,7 @@ type EventsConfiguration struct {
 
 type ExecutorConfiguration struct {
 	Application ApplicationConfiguration
+	Kubernetes  KubernetesConfiguration
 	Task        TaskConfiguration
 	Armada      ArmadaConfiguration
 	Events      EventsConfiguration