Merge branch 'master' into pzduniak/publish-helm-repo

.github/workflows/on-release.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-        
+
       - name: Update 'version' file
         run: |
           export VERSION="${{ github.event.release.tag_name }}"
@@ -22,11 +22,11 @@ jobs:
       # Buildx Needs QEMU
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-      
+
       # We use Buildx so we can take advantage of the caching
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1 
         with:
@@ -35,15 +35,17 @@ jobs:
           password: ${{ github.token }}
       -
         name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           tags: |
             ghcr.io/mailgun/gubernator:${{ github.event.release.tag_name }}
             ghcr.io/mailgun/gubernator:latest
           build-args: |
             VERSION=${{ github.event.release.tag_name }}
-          push: true           
-
+          platforms: linux/amd64,linux/arm64
+          pull: true
+          push: true
+
       # Commit the updated 'version' file
       - name: Commit changes
         uses: EndBug/add-and-commit@v7

CHANGELOG

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0-rc.20] - 2022-05-17
+## Changes
+* Publish multi-arch images #142
+* Helm chart add image pull secrets #141
+* Pin Go to 1.17.9, always pull the base images #140
+
 ## [2.0.0-rc.19] - 2022-04-21
 ## Changes
 * Log level and format config.

Dockerfile

@@ -1,5 +1,5 @@
 # Build image
-FROM --platform=$BUILDPLATFORM golang:1.17 as build
+FROM --platform=$BUILDPLATFORM golang:1.17.9 as build
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
 # https://github.com/docker/buildx/issues/510#issuecomment-768432329

Dockerfile-cli

@@ -1,5 +1,5 @@
 # Build image
-FROM --platform=$BUILDPLATFORM golang:1.17 as build
+FROM --platform=$BUILDPLATFORM golang:1.17.9 as build
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
 # https://github.com/docker/buildx/issues/510#issuecomment-768432329

charts/gubernator/templates/deployment.yaml

@@ -28,6 +28,10 @@ spec:
       {{ else }}
       serviceAccountName: {{ .Values.gubernator.serviceAccount.name }}
       {{- end}}
+      {{- with $.Values.gubernator.image.pullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: gubernator
           env:

version

@@ -1 +1 @@
-v2.0.0-rc.19
+v2.0.0-rc.20