Hotfix: Update pipelines and base chart

winromulus · winromulus · commit 9d90628656c7 · 2021-10-22T21:55:25.000+03:00
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Azure Pipelines Agent
 [Azure Pipelines Agent](https://github.com/emberstack/docker-azure-pipelines-agent) is self-hosted agent that you can run in a container with Docker.
 
-[![Build Status](https://dev.azure.com/emberstack/OpenSource/_apis/build/status/docker-azure-pipelines-agent?branchName=master)](https://dev.azure.com/emberstack/OpenSource/_build/latest?definitionId=17&branchName=master)
+[![Build Status](https://dev.azure.com/emberstack/OpenSource/_apis/build/status/docker-azure-pipelines-agent?branchName=main)](https://dev.azure.com/emberstack/OpenSource/_build/latest?definitionId=17&branchName=main)
 [![Release](https://img.shields.io/github/release/emberstack/docker-azure-pipelines-agent.svg?style=flat-square)](https://github.com/emberstack/docker-azure-pipelines-agent/releases/latest)
 [![Docker Image](https://img.shields.io/docker/image-size/emberstack/azure-pipelines-agent/latest?style=flat-square)](https://hub.docker.com/r/emberstack/azure-pipelines-agent)
 [![Docker Pulls](https://img.shields.io/docker/pulls/emberstack/azure-pipelines-agent.svg?style=flat-square)](https://hub.docker.com/r/emberstack/azure-pipelines-agent)
@@ -16,9 +16,6 @@ The Azure Pipeliens agent can be deployed either manually or using Helm (recomme
 
 ### Support
 If you need help or found a bug, please feel free to open an issue on the [emberstack/docker-azure-pipelines-agent](https://github.com/emberstack/docker-azure-pipelines-agent) GitHub project.  
-  
-You can also join our Slack workspace and talk to us:  
-[![slack](https://img.shields.io/badge/join-emberstack%20on%20Slack-gray.svg?style=flat-square&longCache=true&logo=slack&colorB=green)](https://join.slack.com/t/emberstack/shared_invite/zt-8qyutopg-9ghwTq3OnHSm2tY9Sk5ULA)
 
 #### Deployment using Helm
 
diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
@@ -24,131 +24,129 @@ stages:
         pool:
           vmImage: ubuntu-latest
         steps:
+          - task: HelmInstaller@1
+            inputs:
+              helmVersionToInstall: "3.7.0"
+            displayName: "tools - helm - install"
           - task: DockerInstaller@0
-            displayName: "Docker install"
+            displayName: "tools - docker - install"
             inputs:
-              dockerVersion: "19.03.9"
-
+              dockerVersion: "20.10.9"
           - task: Docker@2
-            displayName: "Docker login"
+            displayName: "tools - docker - login"
             inputs:
               containerRegistry: "Emberstack Docker Hub"
               command: login
 
           - script: |
               mkdir -p artifacts/helm
             workingDirectory: "$(Build.ArtifactStagingDirectory)"
-            displayName: "Create Artifacts directories"
+            displayName: "artifacts - prepare directories"
 
-          - task: HelmInstaller@1
-            inputs:
-              helmVersionToInstall: "3.2.4"
-            displayName: "Helm install"
 
           - script: |
-              cp README.md src/helm/azure-pipelines-agent/README.md
-            displayName: "Import README in helm chart"
-
+              cp README.md src/helm/reflector/README.md
+            displayName: "helm - import README"
           - script: |
               helm package --destination $(Build.ArtifactStagingDirectory)/artifacts/helm --version $(Build.BuildNumber) --app-version $(Build.BuildNumber) src/helm/azure-pipelines-agent
-            displayName: "Helm Package"
-
+            displayName: "helm - template chart"
           - publish: "$(Build.ArtifactStagingDirectory)/artifacts/helm"
             artifact: "helm"
-            displayName: "Publish helm artifact"
+            displayName: "artifacts - publish - helm chart"
 
           - script: |
               docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
               docker buildx rm builder
               docker buildx create --name builder --driver docker-container --use
               docker buildx inspect --bootstrap
-              docker buildx build --push --platform linux/amd64 -t $(imageRepository):build-$(Build.BuildNumber)-amd64 -f src/docker/Dockerfile src/docker
-              docker buildx build --push --platform linux/arm   -t $(imageRepository):build-$(Build.BuildNumber)-arm   -f src/docker/Dockerfile src/docker
-              docker buildx build --push --platform linux/arm64 -t $(imageRepository):build-$(Build.BuildNumber)-arm64 -f src/docker/Dockerfile src/docker
+              docker buildx build --push --platform linux/amd64 -t $(imageRepository):build-$(Build.BuildNumber)-amd64   -f src/ES.Kubernetes.Reflector/Dockerfile src/
+              docker buildx build --push --platform linux/arm   -t $(imageRepository):build-$(Build.BuildNumber)-arm32v7 -f src/ES.Kubernetes.Reflector/Dockerfile src/
+              docker buildx build --push --platform linux/arm64 -t $(imageRepository):build-$(Build.BuildNumber)-arm64v8 -f src/ES.Kubernetes.Reflector/Dockerfile src/
               docker pull $(imageRepository):build-$(Build.BuildNumber)-amd64
-              docker pull $(imageRepository):build-$(Build.BuildNumber)-arm
-              docker pull $(imageRepository):build-$(Build.BuildNumber)-arm64
-              docker manifest create  $(imageRepository):build-$(Build.BuildNumber) $(imageRepository):build-$(Build.BuildNumber)-amd64  $(imageRepository):build-$(Build.BuildNumber)-arm  $(imageRepository):build-$(Build.BuildNumber)-arm64
+              docker pull $(imageRepository):build-$(Build.BuildNumber)-arm32v7
+              docker pull $(imageRepository):build-$(Build.BuildNumber)-arm64v8
+              docker manifest create  $(imageRepository):build-$(Build.BuildNumber) $(imageRepository):build-$(Build.BuildNumber)-amd64  $(imageRepository):build-$(Build.BuildNumber)-arm32v7  $(imageRepository):build-$(Build.BuildNumber)-arm64v8
               docker manifest inspect $(imageRepository):build-$(Build.BuildNumber)
               docker manifest push    $(imageRepository):build-$(Build.BuildNumber)
-            displayName: "Build and push multi-arch Docker image"
-
-  - stage: cd
-    displayName: "CD"
-    dependsOn: "ci"
-    condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'Manual'), in(variables['Build.SourceBranchName'], 'master'))
-    jobs:
-      - job: release
-        displayName: "Release Job"
-        pool:
-          vmImage: ubuntu-latest
-        variables:
-          - group: "OpenSource.GitHub"
-        steps:
-          - checkout: none
-
-          - download: current
-            artifact: "helm"
-            displayName: "Download helm artifact"
-
-          - task: DockerInstaller@0
-            displayName: "Docker install"
-            inputs:
-              dockerVersion: "19.03.9"
-
-          - task: Docker@2
-            displayName: "Docker login"
-            inputs:
-              containerRegistry: "Emberstack Docker Hub"
-              command: login
-
-          - task: HelmInstaller@1
-            inputs:
-              helmVersionToInstall: "3.1.1"
-            displayName: "Helm install"
-
-          - script: |
-              docker pull $(imageRepository):build-$(Build.BuildNumber)-amd64
-              docker pull $(imageRepository):build-$(Build.BuildNumber)-arm
-              docker pull $(imageRepository):build-$(Build.BuildNumber)-arm64
-              docker manifest create  $(imageRepository):$(Build.BuildNumber) $(imageRepository):build-$(Build.BuildNumber)-amd64 $(imageRepository):build-$(Build.BuildNumber)-arm $(imageRepository):build-$(Build.BuildNumber)-arm64
-              docker manifest create  $(imageRepository):latest               $(imageRepository):build-$(Build.BuildNumber)-amd64 $(imageRepository):build-$(Build.BuildNumber)-arm $(imageRepository):build-$(Build.BuildNumber)-arm64
-              docker manifest push    $(imageRepository):$(Build.BuildNumber)
-              docker manifest push    $(imageRepository):latest
-              docker manifest push    $(imageRepository):$(Build.BuildNumber)
-              docker manifest push    $(imageRepository):latest
-              docker tag  $(imageRepository):build-$(Build.BuildNumber)-amd64 $(imageRepository):$(Build.BuildNumber)-amd64
-              docker tag  $(imageRepository):build-$(Build.BuildNumber)-arm64 $(imageRepository):$(Build.BuildNumber)-arm64
-              docker tag  $(imageRepository):build-$(Build.BuildNumber)-arm   $(imageRepository):$(Build.BuildNumber)-arm
-              docker push $(imageRepository):$(Build.BuildNumber)-amd64
-              docker push $(imageRepository):$(Build.BuildNumber)-arm
-              docker push $(imageRepository):$(Build.BuildNumber)-arm64
-            displayName: "Build and push multi-arch Docker image"
-
-          - script: |
-              git config --global user.email "$(emberstack-agent-email)"
-              git config --global user.name "$(emberstack-agent-name)"
-              git clone https://$(emberstack-agent-username):$(emberstack-agent-pat)@github.com/emberstack/helm-charts.git
-
-              mkdir -p helm-charts/charts
-              cp $(Pipeline.Workspace)/helm/azure-pipelines-agent-$(Build.BuildNumber).tgz  helm-charts/charts
-
-              cd helm-charts
-              rm index.yaml
-              helm repo index ./
-              git add .
-              git status
-              git commit -m "Added azure-pipelines-agent-$(Build.BuildNumber).tgz"
-              git push
-            displayName: "Create chart release"
-
-          - task: GitHubRelease@1
-            displayName: "Create GitHub release"
-            inputs:
-              gitHubConnection: GitHub
-              repositoryName: "EmberStack/docker-azure-pipelines-agent"
-              tagSource: userSpecifiedTag
-              tag: "v$(Build.BuildNumber)"
-              title: "Release v$(Build.BuildNumber)"
-              releaseNotesSource: inline
-              releaseNotes: "The release process is automated."
+            displayName: "docker - build and publish"
+
+  - ${{ if eq(variables['Build.SourceBranchName'], 'main') }}:
+    - stage: cd
+      displayName: "CD"
+      dependsOn: "ci"
+      condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'Manual'), in(variables['Build.SourceBranchName'], 'master'))
+      jobs:
+        - job: release
+          displayName: "Release"
+          pool:
+            vmImage: ubuntu-latest
+          variables:
+            - group: "OpenSource.GitHub"
+          steps:
+            - checkout: none
+
+
+            - task: HelmInstaller@1
+              inputs:
+                helmVersionToInstall: "3.7.0"
+              displayName: "tools - helm - install"
+            - task: DockerInstaller@0
+              displayName: "tools - docker - install"
+              inputs:
+                dockerVersion: "20.10.9"
+            - task: Docker@2
+              displayName: "tools - docker - login"
+              inputs:
+                containerRegistry: "Emberstack Docker Hub"
+                command: login
+
+
+            - download: current
+              artifact: "helm"
+              displayName: "artifacts - download - helm chart"
+
+
+            - script: |
+                docker pull $(imageRepository):build-$(Build.BuildNumber)-amd64
+                docker pull $(imageRepository):build-$(Build.BuildNumber)-arm32v7
+                docker pull $(imageRepository):build-$(Build.BuildNumber)-arm64v8
+                docker manifest create  $(imageRepository):$(Build.BuildNumber) $(imageRepository):build-$(Build.BuildNumber)-amd64 $(imageRepository):build-$(Build.BuildNumber)-arm32v7 $(imageRepository):build-$(Build.BuildNumber)-arm64v8
+                docker manifest create  $(imageRepository):latest               $(imageRepository):build-$(Build.BuildNumber)-amd64 $(imageRepository):build-$(Build.BuildNumber)-arm32v7 $(imageRepository):build-$(Build.BuildNumber)-arm64v8
+                docker manifest push    $(imageRepository):$(Build.BuildNumber)
+                docker manifest push    $(imageRepository):latest
+                docker manifest push    $(imageRepository):$(Build.BuildNumber)
+                docker manifest push    $(imageRepository):latest
+                docker tag  $(imageRepository):build-$(Build.BuildNumber)-amd64     $(imageRepository):$(Build.BuildNumber)-amd64
+                docker tag  $(imageRepository):build-$(Build.BuildNumber)-arm32v7   $(imageRepository):$(Build.BuildNumber)-arm32v7
+                docker tag  $(imageRepository):build-$(Build.BuildNumber)-arm64v8   $(imageRepository):$(Build.BuildNumber)-arm64v8
+                docker push $(imageRepository):$(Build.BuildNumber)-amd64
+                docker push $(imageRepository):$(Build.BuildNumber)-arm32v7
+                docker push $(imageRepository):$(Build.BuildNumber)-arm64v8
+              displayName: "Build and push multi-arch Docker image"
+            - script: |
+                git config --global user.email "$(emberstack-agent-email)"
+                git config --global user.name "$(emberstack-agent-name)"
+                git clone https://$(emberstack-agent-username):$(emberstack-agent-pat)@github.com/emberstack/helm-charts.git
+
+                mkdir -p helm-charts/charts
+                cp $(Pipeline.Workspace)/helm/azure-pipelines-agent-$(Build.BuildNumber).tgz  helm-charts/charts
+
+                cd helm-charts
+                rm index.yaml
+                helm repo index ./
+                git add .
+                git status
+                git commit -m "Added azure-pipelines-agent-$(Build.BuildNumber).tgz"
+                git push
+              displayName: "github - release - chart"
+
+            - task: GitHubRelease@1
+              displayName: "github - create release"
+              inputs:
+                gitHubConnection: GitHub
+                repositoryName: "EmberStack/docker-azure-pipelines-agent"
+                tagSource: userSpecifiedTag
+                tag: "v$(Build.BuildNumber)"
+                title: "Release v$(Build.BuildNumber)"
+                releaseNotesSource: inline
+                releaseNotes: "The release process is automated."
diff --git a/src/helm/azure-pipelines-agent/templates/_helpers.tpl b/src/helm/azure-pipelines-agent/templates/_helpers.tpl
@@ -1,35 +1,34 @@
-{{/* vim: set filetype=mustache: */}}
 {{/*
 Expand the name of the chart.
 */}}
 {{- define "azure-pipelines-agent.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
 
 {{/*
 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.
 */}}
 {{- define "azure-pipelines-agent.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
 
 {{/*
 Create chart name and version as used by the chart label.
 */}}
 {{- define "azure-pipelines-agent.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
 
 {{/*
 Common labels
@@ -41,23 +40,23 @@ helm.sh/chart: {{ include "azure-pipelines-agent.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
+{{- end }}
 
 {{/*
 Selector labels
 */}}
 {{- define "azure-pipelines-agent.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "azure-pipelines-agent.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
+{{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
 {{- define "azure-pipelines-agent.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "azure-pipelines-agent.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "azure-pipelines-agent.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/src/helm/azure-pipelines-agent/templates/serviceaccount.yaml b/src/helm/azure-pipelines-agent/templates/serviceaccount.yaml
@@ -4,5 +4,9 @@ kind: ServiceAccount
 metadata:
   name: {{ include "azure-pipelines-agent.serviceAccountName" . }}
   labels:
-{{ include "azure-pipelines-agent.labels" . | nindent 4 }}
-{{- end -}}
+    {{- include "azure-pipelines-agent.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/src/helm/azure-pipelines-agent/templates/statefulset.yaml b/src/helm/azure-pipelines-agent/templates/statefulset.yaml
@@ -10,21 +10,22 @@ spec:
   selector:
     matchLabels:
       {{- include "azure-pipelines-agent.selectorLabels" . | nindent 6 }}
-  serviceName: test
   template:
     metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       labels:
         {{- include "azure-pipelines-agent.selectorLabels" . | nindent 8 }}
     spec:
-    {{- with .Values.imagePullSecrets }}
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
-    {{- end }}
-      serviceAccountName: {{ template "azure-pipelines-agent.serviceAccountName" . }}
-      {{- if .Values.securityContext }}
-      securityContext:
-        {{- toYaml .Values.securityContext | nindent 8 }}
       {{- end }}
+      serviceAccountName: {{ include "azure-pipelines-agent.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
           {{- if .Values.pipelines.agent.mountDocker }}
@@ -42,10 +43,7 @@ spec:
             {{- end }}
           {{- end }}
           {{- if .Values.image.tag }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          {{- else }}
-          image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
-          {{- end }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: AZP_AGENT_NAME
diff --git a/src/helm/azure-pipelines-agent/values.yaml b/src/helm/azure-pipelines-agent/values.yaml
@@ -6,8 +6,9 @@ replicaCount: 1
 
 image:
   repository: emberstack/azure-pipelines-agent
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
   tag: ""
-  pullPolicy: Always
 
 imagePullSecrets: []
 nameOverride: ""
