From 4a4bb1f9f3676afcc7be866baf21d98537017caf Mon Sep 17 00:00:00 2001 From: Piotr Zduniak Date: Thu, 28 Apr 2022 18:18:39 +0200 Subject: [PATCH 1/6] Pin Go to 1.17.9, always pull the base image --- .github/workflows/on-release.yml | 3 ++- Dockerfile | 2 +- Dockerfile-cli | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml index 89783669..8f608e14 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release.yml @@ -38,7 +38,8 @@ jobs: ghcr.io/mailgun/gubernator:latest build-args: | VERSION=${{ github.event.release.tag_name }} - push: true + pull: true + push: true # Commit the updated 'version' file - name: Commit changes diff --git a/Dockerfile b/Dockerfile index 167b874d..0069e0b7 100644 --- a/Dockerfile +++ b/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 diff --git a/Dockerfile-cli b/Dockerfile-cli index 38dba9df..65dabc5a 100644 --- a/Dockerfile-cli +++ b/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 From f13bd489b287996b9f2a6235ec2a41eb5c851c3e Mon Sep 17 00:00:00 2001 From: maxmeng-oss <76612687+maxmeng-oss@users.noreply.github.com> Date: Fri, 6 May 2022 11:26:39 +0800 Subject: [PATCH 2/6] helm chart add image pull secrets --- deploy/helm/templates/deployment.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deploy/helm/templates/deployment.yaml b/deploy/helm/templates/deployment.yaml index 35a594fe..3e8f81a4 100644 --- a/deploy/helm/templates/deployment.yaml +++ b/deploy/helm/templates/deployment.yaml @@ -28,12 +28,17 @@ spec: {{ else }} serviceAccountName: {{ .Values.gubernator.serviceAccount.name }} {{- end}} + {{- with $.Values.gubernator.image.pullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: gubernator env: {{- include "gubernator.env" . | nindent 10 }} image: {{ .Values.gubernator.image.repository }}:{{ .Values.gubernator.image.tag | default .Chart.AppVersion }} imagePullPolicy: {{ .Values.gubernator.image.pullPolicy }} + imagePullPolicy: {{ .Values.gubernator.image.pullPolicy }} ports: - name: grpc containerPort: {{ include "gubernator.grpc.port" . }} From 2ba91e082d71f23282fec2fe5cf63775d7557780 Mon Sep 17 00:00:00 2001 From: Max Meng <76612687+maxmeng-oss@users.noreply.github.com> Date: Fri, 6 May 2022 11:30:07 +0800 Subject: [PATCH 3/6] minor fix typo --- deploy/helm/templates/deployment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/helm/templates/deployment.yaml b/deploy/helm/templates/deployment.yaml index 3e8f81a4..5dbc19b8 100644 --- a/deploy/helm/templates/deployment.yaml +++ b/deploy/helm/templates/deployment.yaml @@ -38,7 +38,6 @@ spec: {{- include "gubernator.env" . | nindent 10 }} image: {{ .Values.gubernator.image.repository }}:{{ .Values.gubernator.image.tag | default .Chart.AppVersion }} imagePullPolicy: {{ .Values.gubernator.image.pullPolicy }} - imagePullPolicy: {{ .Values.gubernator.image.pullPolicy }} ports: - name: grpc containerPort: {{ include "gubernator.grpc.port" . }} From d80c0f6ea377ce868f6f0a69d847d83f57dc29c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3n=20T=C3=B3mas=20Gr=C3=A9tarsson?= Date: Fri, 13 May 2022 13:54:25 -0700 Subject: [PATCH 4/6] Publish multi-arch images We merged https://github.com/mailgun/gubernator/pull/132 a few months ago, but looks like without augmenting the actual publish step, we don't... actually publish. --- .github/workflows/on-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml index 89783669..2abb4d93 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release.yml @@ -31,13 +31,14 @@ 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 }} + platforms: linux/amd64,linux/arm64 push: true # Commit the updated 'version' file From 2e6c7eec275e963d557a615e37d61dbc6980c32d Mon Sep 17 00:00:00 2001 From: "Derrick J. Wippler" Date: Tue, 17 May 2022 10:27:53 -0500 Subject: [PATCH 5/6] Update CHANGELOG --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 3a2d6372..352269f5 100644 --- a/CHANGELOG +++ b/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. From adc5d55fcf5193b1e55ad528df9e6f57a51fbd97 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 15:32:50 +0000 Subject: [PATCH 6/6] Update version number --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 3e9265fb..99c95442 100644 --- a/version +++ b/version @@ -1 +1 @@ -v2.0.0-rc.19 +v2.0.0-rc.20