Skip to content

Commit

Permalink
ci: build images for arm and amd using github-action-matrix-outputs
Browse files Browse the repository at this point in the history
Signed-off-by: Misha Sakhnov <[email protected]>
  • Loading branch information
mikhail-sakhnov committed Nov 15, 2024
1 parent ae84971 commit 9d868b9
Show file tree
Hide file tree
Showing 7 changed files with 230 additions and 101 deletions.
140 changes: 89 additions & 51 deletions .github/workflows/build-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,35 @@ on:
description: 'Should images be uploaded to neon ECR'
type: boolean
required: false
arch:
description: 'Architecture to build for'
type: string
required: false
default: 'amd64'
matrix-step-name:
required: false
type: string
matrix-key:
required: false
type: string

outputs:

controller:
description: 'neonvm-controller image'
value: ${{ jobs.tags.outputs.controller }}
value: ${{ jobs.save-matrix-results.outputs.controller }}
vxlan-controller:
description: 'neonvm-vxlan-controller image'
value: ${{ jobs.tags.outputs.vxlan-controller }}
value: ${{ jobs.save-matrix-results.outputs.vxlan-controller}}
runner:
description: 'neonvm-runner image'
value: ${{ jobs.tags.outputs.runner }}
value: ${{ jobs.save-matrix-results.outputs.runner}}
scheduler:
description: 'autoscale-scheduler image'
value: ${{ jobs.tags.outputs.scheduler }}
value: ${{ jobs.save-matrix-results.outputs.scheduler}}
autoscaler-agent:
description: 'autoscaler-agent image'
value: ${{ jobs.tags.outputs.autoscaler-agent }}
value: ${{ jobs.save-matrix-results.outputs.autoscaler-agent}}

env:
IMG_CONTROLLER: "neondatabase/neonvm-controller"
Expand All @@ -58,64 +71,63 @@ env:
ECR_DEV: "369495373322.dkr.ecr.eu-central-1.amazonaws.com"
ECR_PROD: "093970136003.dkr.ecr.eu-central-1.amazonaws.com"

# Why localhost? We use a local registry so that when docker/build-push-action tries to pull the
# image we built locally, it'll actually have a place to pull from.
#
# Otherwise, if we just try to use a local image, it fails trying to pull it from dockerhub.
# See https://github.com/moby/buildkit/issues/2343 for more information.
GO_BASE_IMG: "localhost:5000/neondatabase/autoscaling-go-base:dev"
# Default architecture to build. In future it would be changed to multi-arch build or separate builds for each arch
TARGET_ARCH: "amd64"

defaults:
run:
shell: bash -euo pipefail {0}

jobs:
tags:
outputs:
controller: ${{ steps.show-tags.outputs.controller }}
vxlan-controller: ${{ steps.show-tags.outputs.vxlan-controller }}
runner: ${{ steps.show-tags.outputs.runner }}
scheduler: ${{ steps.show-tags.outputs.scheduler }}
autoscaler-agent: ${{ steps.show-tags.outputs.autoscaler-agent }}
cluster-autoscaler: ${{ steps.show-tags.outputs.cluster-autoscaler }}
runs-on: ubuntu-latest
steps:
- id: show-tags
run: |
echo "controller=${{ env.IMG_CONTROLLER }}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "vxlan-controller=${{ env.IMG_VXLAN_CONTROLLER }}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "runner=${{ env.IMG_RUNNER }}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "scheduler=${{ env.IMG_SCHEDULER }}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "autoscaler-agent=${{ env.IMG_AUTOSCALER_AGENT }}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "cluster-autoscaler=${{ env.IMG_CLUSTER_AUTOSCALER }}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
vm-kernel:
# nb: use format(..) to catch both inputs.skip = true AND inputs.skip = 'true'.
if: ${{ format('{0}', inputs.skip) != 'true' }}
uses: ./.github/workflows/vm-kernel.yaml
with:
tag: ${{ inputs.kernel-image || inputs.tag }}
return-image-for-tag: ${{ inputs.kernel-image }}
arch: ${{ inputs.arch }}
secrets: inherit

build:
# nb: use format(..) to catch both inputs.skip = true AND inputs.skip = 'true'.
if: ${{ format('{0}', inputs.skip) != 'true' }}
needs: [ tags, vm-kernel ]
runs-on: [ self-hosted, large ]
needs: [ vm-kernel ]
outputs:
controller: ${{ steps.tags.outputs.controller }}
vxlan-controller: ${{ steps.tags.outputs.vxlan-controller }}
runner: ${{ steps.tags.outputs.runner }}
scheduler: ${{ steps.tags.outputs.scheduler }}
autoscaler-agent: ${{ steps.tags.outputs.autoscaler-agent }}
cluster-autoscaler: ${{ steps.tags.outputs.cluster-autoscaler }}
env:
# Why localhost? We use a local registry so that when docker/build-push-action tries to pull the
# image we built locally, it'll actually have a place to pull from.
#
# Otherwise, if we just try to use a local image, it fails trying to pull it from dockerhub.
# See https://github.com/moby/buildkit/issues/2343 for more information.
GO_BASE_IMG: ${{ format('localhost:5000/neondatabase/autoscaling-go-base-{0}:dev', inputs.arch) }}
permissions:
contents: read # This is required for actions/checkout
id-token: write # This is required for aws-actions/configure-aws-credentials

runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', inputs.arch == 'arm64' && 'large-arm64' || 'large')) }}

services:
registry:
image: registry:2
ports:
- 5000:5000

steps:
# tags converted to be a step and moved here to be in the same strategy context

- id: tags
run: |
echo "controller=${{ env.IMG_CONTROLLER }}-${{inputs.arch}}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "vxlan-controller=${{ env.IMG_VXLAN_CONTROLLER }}-${{inputs.arch}}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "runner=${{ env.IMG_RUNNER }}-${{inputs.arch}}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "scheduler=${{ env.IMG_SCHEDULER }}-${{inputs.arch}}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "autoscaler-agent=${{ env.IMG_AUTOSCALER_AGENT }}-${{inputs.arch}}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "cluster-autoscaler=${{ env.IMG_CLUSTER_AUTOSCALER }}-${{inputs.arch}}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
- uses: actions/checkout@v4
with:
fetch-depth: 0 # fetch all, so that we also include tags
Expand Down Expand Up @@ -164,7 +176,6 @@ jobs:
registry: cache.neon.build
username: ${{ secrets.NEON_CI_DOCKERCACHE_USERNAME }}
password: ${{ secrets.NEON_CI_DOCKERCACHE_PASSWORD }}

- name: Configure dev AWS credentials
if: ${{ format('{0}', inputs.upload-to-ecr) == 'true' }}
uses: aws-actions/configure-aws-credentials@v4
Expand Down Expand Up @@ -212,7 +223,7 @@ jobs:
id: build-go-dependencies-image
with:
context: .
platforms: linux/amd64

push: true
file: Dockerfile.go-base
cache-from: type=registry,ref=cache.neon.build/autoscaling-go-base:cache
Expand All @@ -223,12 +234,12 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64
push: true
platforms: linux/${{ inputs.arch }}
file: neonvm-runner/Dockerfile
cache-from: type=registry,ref=cache.neon.build/neonvm-runner:cache
cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/neonvm-runner:cache,mode=max' || '' }}
tags: ${{ needs.tags.outputs.runner }}
tags: ${{ steps.tags.outputs.runner }}
build-args: |
GO_BASE_IMG=${{ env.GO_BASE_IMG }}
Expand All @@ -247,41 +258,41 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64
platforms: linux/${{ inputs.arch }}
push: true
file: neonvm-controller/Dockerfile
cache-from: type=registry,ref=cache.neon.build/neonvm-controller:cache
cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/neonvm-controller:cache,mode=max' || '' }}
tags: ${{ needs.tags.outputs.controller }}
tags: ${{ steps.tags.outputs.controller }}
build-args: |
GO_BASE_IMG=${{ env.GO_BASE_IMG }}
VM_RUNNER_IMAGE=${{ needs.tags.outputs.runner }}
VM_RUNNER_IMAGE=${{ steps.tags.outputs.runner }}
BUILDTAGS=${{ steps.controller-build-tags.outputs.buildtags }}
- name: Build and push neonvm-vxlan-controller image
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64
platforms: linux/${{ inputs.arch }}
push: true
file: neonvm-vxlan-controller/Dockerfile
cache-from: type=registry,ref=cache.neon.build/neonvm-vxlan-controller:cache
cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/neonvm-vxlan-controller:cache,mode=max' || '' }}
tags: ${{ needs.tags.outputs.vxlan-controller }}
tags: ${{ steps.tags.outputs.vxlan-controller }}
build-args: |
GO_BASE_IMG=${{ env.GO_BASE_IMG }}
TARGET_ARCH=${{ env.TARGET_ARCH }}
TARGET_ARCH=${{ inputs.arch }}
- name: Build and push autoscale-scheduler image
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64
platforms: linux/${{ inputs.arch }}
push: true
file: autoscale-scheduler/Dockerfile
cache-from: type=registry,ref=cache.neon.build/autoscale-scheduler:cache
cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/autoscale-scheduler:cache,mode=max' || '' }}
tags: ${{ needs.tags.outputs.scheduler }}
tags: ${{ steps.tags.outputs.scheduler}}
build-args: |
GO_BASE_IMG=${{ env.GO_BASE_IMG }}
GIT_INFO=${{ steps.get-git-info.outputs.info }}:${{ inputs.tag }}
Expand All @@ -290,12 +301,12 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64
platforms: linux/${{ inputs.arch }}
push: true
file: autoscaler-agent/Dockerfile
cache-from: type=registry,ref=cache.neon.build/autoscaler-agent:cache
cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/autoscaler-agent:cache,mode=max' || '' }}
tags: ${{ needs.tags.outputs.autoscaler-agent }}
tags: ${{ steps.tags.outputs.autoscaler-agent}}
build-args: |
GO_BASE_IMG=${{ env.GO_BASE_IMG }}
GIT_INFO=${{ steps.get-git-info.outputs.info }}
Expand All @@ -305,9 +316,10 @@ jobs:
if: ${{ format('{0}', inputs.build-cluster-autoscaler) == 'true' }}
with:
context: cluster-autoscaler
platforms: linux/amd64
platforms: linux/${{ inputs.arch }}
push: true
tags: ${{ needs.tags.outputs.cluster-autoscaler }}
target: ${{format('cluster_autoscaler_{0}', inputs.arch)}}
tags: ${{ steps.tags.outputs.cluster-autoscaler}}
cache-from: type=registry,ref=cache.neon.build/cluster-autoscaler-neonvm:cache
cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/cluster-autoscaler-neonvm:cache,mode=max' || '' }}
build-args: |
Expand All @@ -332,3 +344,29 @@ jobs:
docker buildx imagetools create -t ${{ env.ECR_PROD }}/${image}:${{ inputs.tag }} \
neondatabase/${image}:${{ inputs.tag }}
done
save-matrix-results:
runs-on: ubuntu-latest
needs: [build]
steps:
## Write for matrix outputs workaround
- uses: cloudposse/github-action-matrix-outputs-write@v1
id: out
with:
matrix-step-name: ${{ inputs.matrix-step-name }}
matrix-key: ${{ inputs.matrix-key }}
outputs: |-
controller: ${{ needs.build.outputs.controller }}
vxlan-controller: ${{ needs.build.outputs.vxlan-controller }}
runner: ${{ needs.build.outputs.runner }}
scheduler: ${{ needs.build.outputs.scheduler }}
autoscaler-agent: ${{ needs.build.outputs.autoscaler-agent }}
cluster-autoscaler: ${{ needs.build.outputs.cluster-autoscaler }}
outputs:
controller: ${{ steps.out.outputs.controller }}
vxlan-controller: ${{ steps.out.outputs.vxlan-controller }}
runner: ${{ steps.out.outputs.runner }}
scheduler: ${{ steps.out.outputs.scheduler }}
autoscaler-agent: ${{ steps.out.outputs.autoscaler-agent }}
cluster-autoscaler: ${{ steps.out.outputs.cluster-autoscaler }}
78 changes: 57 additions & 21 deletions .github/workflows/build-test-vm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,39 +22,47 @@ on:
type: boolean
required: false
default: false
arch:
description: 'Architecture to build for'
type: string
required: false
default: 'amd64'
matrix-step-name:
required: false
type: string
matrix-key:
required: false
type: string
outputs:
vm-postgres-16-bullseye:
description: 'image name for postgres:16-bullseye, VM-ified'
value: ${{ jobs.tags.outputs.vm-postgres-16-bullseye }}
value: ${{ jobs.build.outputs.vm-postgres-16-bullseye }}

env:
IMG_POSTGRES_16_BULLSEYE: "neondatabase/vm-postgres-16-bullseye"
# using image built in the same workflow
IMG_DAEMON: "daemon:dev"
TARGET_ARCH: "amd64"
IMG_DAEMON: "daemon"

defaults:
run:
shell: bash -euo pipefail {0}

jobs:
tags:
outputs:
vm-postgres-16-bullseye: ${{ steps.show-tags.outputs.vm-postgres-16-bullseye }}
daemon: ${{ steps.show-tags.outputs.daemon }}
runs-on: ubuntu-latest
steps:
- id: show-tags
run: |
echo "vm-postgres-16-bullseye=${{ env.IMG_POSTGRES_16_BULLSEYE }}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "daemon=${{ env.IMG_DAEMON }}" | tee -a $GITHUB_OUTPUT

build:
# nb: use format(..) to catch both inputs.skip = true AND inputs.skip = 'true'.
if: ${{ format('{0}', inputs.skip) != 'true' }}
needs: tags
runs-on: [ self-hosted, gen3, large ]
outputs:
vm-postgres-16-bullseye: ${{ steps.tags.outputs.vm-postgres-16-bullseye }}
daemon: ${{ steps.tags.outputs.daemon }}
# TODO: do we need gen3 runners? to clarify with dev exp team
runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', inputs.arch == 'arm64' && 'large-arm64' || 'large')) }}
steps:
# tags converted to be a step and moved here to be in the same strategy contextt
- id: tags
run: |
echo "vm-postgres-16-bullseye=${{ env.IMG_POSTGRES_16_BULLSEYE }}-${{inputs.arch}}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
echo "daemon=${{ env.IMG_DAEMON }}-${{inputs.arch}}:dev" | tee -a $GITHUB_OUTPUT
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
Expand All @@ -63,15 +71,24 @@ jobs:
cache: false
# Sometimes setup-go gets stuck. Without this, it'll keep going until the job gets killed
timeout-minutes: 10
- run: make docker-build-daemon
- name: Build daemon image
uses: docker/build-push-action@v6
with:
context: .
push: false
platforms: linux/${{ inputs.arch }}
file: neonvm-daemon/Dockerfile
cache-from: type=registry,ref=cache.neon.build/neonvm-daemon:cache
cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/neonvm-daemon:cache,mode=max' || '' }}
tags: ${{ steps.tags.outputs.daemon }}
- run: make bin/vm-builder

- name: upload vm-builder
if: ${{ format('{0}', inputs.upload-vm-builder) == 'true' }}
uses: actions/upload-artifact@v4
with:
name: vm-builder
path: bin/vm-builder
path: ${{format('bin/vm-builder-{0}', inputs.arch)}}
if-no-files-found: error
retention-days: 2

Expand All @@ -84,9 +101,28 @@ jobs:
username: ${{ secrets.NEON_DOCKERHUB_USERNAME }}
password: ${{ secrets.NEON_DOCKERHUB_PASSWORD }}

- name: build ${{ needs.tags.outputs.vm-postgres-16-bullseye }}
- name: build ${{ steps.tags.outputs.vm-postgres-16-bullseye }}
run: |
./bin/vm-builder -src postgres:16-bullseye -spec tests/e2e/image-spec.yaml -dst ${{ needs.tags.outputs.vm-postgres-16-bullseye }} -daemon-image ${{ needs.tags.outputs.daemon }} -target-arch linux/${TARGET_ARCH}
- name: docker push ${{ needs.tags.outputs.vm-postgres-16-bullseye }}
./bin/vm-builder -src postgres:16-bullseye -spec tests/e2e/image-spec.yaml -dst ${{ steps.tags.outputs.vm-postgres-16-bullseye }} -daemon-image ${{ steps.tags.outputs.daemon }} -target-arch linux/${{ inputs.arch }}
- name: docker push ${{ steps.tags.outputs.vm-postgres-16-bullseye }}
run: |
docker push ${{ needs.tags.outputs.vm-postgres-16-bullseye }}
docker push ${{ steps.tags.outputs.vm-postgres-16-bullseye }}
save-matrix-results:
runs-on: ubuntu-latest
needs: [build]
steps:
## Write for matrix outputs workaround
- uses: cloudposse/github-action-matrix-outputs-write@v1
id: out
with:
matrix-step-name: ${{ inputs.matrix-step-name }}
matrix-key: ${{ inputs.matrix-key }}
outputs: |-
vm-postgres-16-bullseye: ${{ needs.build.outputs.vm-postgres-16-bullseye }}
daemon: ${{ needs.build.outputs.daemon }}
outputs:
vm-postgres-16-bullseye: ${{ steps.out.outputs.vm-postgres-16-bullseye }}
daemon: ${{ steps.out.outputs.daemon }}
Loading

0 comments on commit 9d868b9

Please sign in to comment.