Merge branch 'develop' into main

clemlesne · Apr 15, 2023 · 78efd67 · 78efd67
2 parents a961e97 + 91ef556
commit 78efd67
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 17 deletions.
diff --git a/src/helm/azure-pipelines-agent/templates/_helpers.tpl b/src/helm/azure-pipelines-agent/templates/_helpers.tpl
@@ -7,8 +7,8 @@ Expand the name of the chart.
 
 {{/*
 Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
+
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name.
 */}}
 {{- define "this.fullname" -}}
 {{- if .Values.fullnameOverride }}
@@ -31,7 +31,7 @@ Create chart name and version as used by the chart label.
 {{- end }}
 
 {{/*
-Common labels
+Common labels.
 */}}
 {{- define "this.labels" -}}
 helm.sh/chart: {{ include "this.chart" . }}
@@ -43,15 +43,15 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
 {{/*
-Selector labels
+Selector labels.
 */}}
 {{- define "this.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "this.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
-Create the name of the service account to use
+Create the name of the service account to use.
 */}}
 {{- define "this.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
@@ -61,6 +61,17 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
+{{/*
+Common definition for Pod object.
+
+Usage example:
+
+{{- $data := dict
+  "restartPolicy" "Always"
+  "azpAgentName" (dict "value" (printf "%s-%s" (include "this.fullname" .) "template"))
+}}
+{{- include "this.podSharedTemplate" (merge (dict "Args" $data) . ) | nindent 6 }}
+*/}}
 {{- define "this.podSharedTemplate" -}}
 {{- with .Values.imagePullSecrets }}
 imagePullSecrets:
@@ -76,6 +87,7 @@ initContainers:
   {{- toYaml . | nindent 2 }}
 {{- end }}
 terminationGracePeriodSeconds: {{ .Values.pipelines.timeout | int | required "A value for .Values.pipelines.timeout is required" }}
+restartPolicy: {{ .Args.restartPolicy }}
 containers:
   - name: azp-agent
     securityContext:
@@ -88,12 +100,12 @@ containers:
     lifecycle:
       preStop:
         exec:
-          command: [bash, -c, "bash ${AZP_HOME}/config.sh remove --auth PAT --token $AZP_TOKEN"]
+          command: [bash, -c, "bash ${AZP_HOME}/config.sh remove --auth PAT --token ${AZP_TOKEN}"]
     env:
       - name: VSO_AGENT_IGNORE
         value: AZP_TOKEN
       - name: AZP_AGENT_NAME
-        value: {{ include "this.fullname" . }}-template
+        {{- toYaml .Args.azpAgentName | nindent 8 }}
       - name: AZP_URL
         valueFrom:
           secretKeyRef:

diff --git a/src/helm/azure-pipelines-agent/templates/deployment.yaml b/src/helm/azure-pipelines-agent/templates/deployment.yaml
@@ -2,14 +2,19 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "this.fullname" . }}-{{ .Release.Revision }}
+  name: {{ include "this.fullname" . }}
   labels:
     {{- include "this.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
       {{- include "this.selectorLabels" . | nindent 6 }}
   replicas: {{ .Values.replicaCount | int | required "A value for .Values.replicaCount is required" }}
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 50%
+      maxUnavailable: 0
   template:
     metadata:
       labels:
@@ -21,7 +26,9 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
-      # The pod will shut down at each run, we need to restart it
-      restartPolicy: Always
-      {{- include "this.podSharedTemplate" . | nindent 6 }}
+      {{- $data := dict
+        "restartPolicy" "Always"
+        "azpAgentName" (dict "valueFrom" (dict "fieldRef" (dict "apiVersion" "v1" "fieldPath" "metadata.name" )))
+      }}
+      {{- include "this.podSharedTemplate" (merge (dict "Args" $data) . ) | nindent 6 }}
 {{- end }}
diff --git a/src/helm/azure-pipelines-agent/templates/hpa.yaml b/src/helm/azure-pipelines-agent/templates/hpa.yaml
@@ -35,9 +35,11 @@ spec:
           {{- toYaml . | nindent 10 }}
           {{- end }}
       spec:
-        # The job cannot crash, this is not functionally intended; a shutdown is functionally a pipeline end
-        restartPolicy: Never
-        {{- include "this.podSharedTemplate" . | nindent 8 }}
+        {{- $data := dict
+          "restartPolicy" "Never"
+          "azpAgentName" (dict "valueFrom" (dict "fieldRef" (dict "apiVersion" "v1" "fieldPath" "metadata.name" )))
+        }}
+        {{- include "this.podSharedTemplate" (merge (dict "Args" $data) . ) | nindent 8 }}
   maxReplicaCount: {{ .Values.autoscaling.maxReplicas | int | required "A value for .Values.autoscaling.maxReplicas is required" }}
   minReplicaCount: 0
   pollingInterval: 15

diff --git a/src/helm/azure-pipelines-agent/templates/pod.yaml b/src/helm/azure-pipelines-agent/templates/pod.yaml
@@ -12,7 +12,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  # This agent is a template, we privilegiate Jobs instead of it, but we need to run it first
-  restartPolicy: Never
-  {{- include "this.podSharedTemplate" . | nindent 2 }}
+  {{- $data := dict
+    "restartPolicy" "Never"
+    "azpAgentName" (dict "value" (printf "%s-%s" (include "this.fullname" .) "template"))
+  }}
+  {{- include "this.podSharedTemplate" (merge (dict "Args" $data) . ) | nindent 2 }}
 {{- end }}