Improve k8s ci

Author: vtm9

Makefile

@@ -1,4 +1,5 @@
-include make-compose.mk
+ROOT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+include $(ROOT_DIR)make-compose.mk
 
 BUILDX_OUTPUT ?= --load
 

k8s/Makefile

@@ -18,7 +18,7 @@ kb-get-services:
 helm-init: helm-install-app
 
 helm-upgrade-app:
-	helm upgrade --install app $(PWD)/app-chart -f $(PWD)/envs/common/values.yaml -f $(PWD)/envs/simple/values.yaml
+	helm upgrade --install app --reset-values $(PWD)/app-chart -f $(PWD)/envs/common/values.yaml -f $(PWD)/envs/simple/values.yaml
 
 helm-rollback-app:
 	helm rollback app 108

k8s/app-chart/templates/runner_deployment.yaml

@@ -19,13 +19,25 @@ spec:
     spec:
       affinity:
         podAntiAffinity:
+          {{- if .Values.runner.antiAffinity.required }}
           requiredDuringSchedulingIgnoredDuringExecution:
             - labelSelector:
                 matchExpressions:
                   - key: app
                     operator: In
                     values: ["runner"]
               topologyKey: "kubernetes.io/hostname"
+          {{- else }}
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchExpressions:
+                    - key: app
+                      operator: In
+                      values: ["runner"]
+                topologyKey: "kubernetes.io/hostname"
+          {{- end }}
       volumes:
         - name: users-code-path
           hostPath:

k8s/app-chart/templates/zig_runner_deployment.yaml

@@ -39,12 +39,12 @@ spec:
           matchLabels:
             app: "runner-{{ .name }}"
       {{- end }}
-      {{- if or $.Values.zigRunners.avoidCodebattleNode $.Values.zigRunners.affinity }}
+      {{- if or $.Values.zigRunners.affinity (and $.Values.zigRunners.avoidCodebattleNode (ne $.Values.zigRunners.strategy "simple")) }}
       affinity:
         {{- with $.Values.zigRunners.affinity }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- if $.Values.zigRunners.avoidCodebattleNode }}
+        {{- if and $.Values.zigRunners.avoidCodebattleNode (ne $.Values.zigRunners.strategy "simple") }}
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:

k8s/app-chart/values.yaml

@@ -52,6 +52,8 @@ codebattle:
 runner:
   enabled: true
   replicaCount: 1
+  antiAffinity:
+    required: true
   # Deployment or DaemonSet
   type: Deployment
   image:

k8s/envs/simple/values.yaml

@@ -18,6 +18,8 @@ codebattle:
 runner:
   enabled: true
   replicaCount: 1
+  antiAffinity:
+    required: false
 
 zigRunners:
   strategy: simple