diff --git a/.github/workflows/manual-deploy.yml b/.github/workflows/manual-deploy.yml index c30ee87..a6d6e55 100644 --- a/.github/workflows/manual-deploy.yml +++ b/.github/workflows/manual-deploy.yml @@ -3,28 +3,28 @@ name: 🐝 Manually deploy runners on: workflow_dispatch: # deploy on demand inputs: - target_scale_set: # name our runner set + target_scale_set: # name our runner set # In this repository, this corresponds to the helm chart name in `/deployments/helm-***.yml`. # e.g., `ubi8` would target `/deployments/helm-ubi8.yml` description: "Which scale set to deploy?" type: string required: true - environment_name: # this corresponds to the environments we set up for our `kubeconfig` files + environment_name: # this corresponds to the environments we set up for our `kubeconfig` files description: "Which environment to deploy to?" - type: choice # drop-down menus are fantastic! + type: choice # drop-down menus are fantastic! required: true - options: # change these to your own names or change :point_up: to a `string` for freeform entry. - - "bare-metal" - - "test" - - "production" + options: # change these to your own names or change :point_up: to a `string` for freeform entry. + - "bare-metal" + - "test" + - "production" default: "test" runner_namespace: description: "Which namespace to deploy to?" type: choice required: true - options: # again, change this to your own namespaces - - "runners" - - "test-runners" + options: # again, change this to your own namespaces + - "runners" + - "test-runners" default: "test-runners" jobs: @@ -37,6 +37,13 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Login to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Write out the kubeconfig info run: | echo ${{ secrets.DEPLOY_ACCOUNT }} | base64 -d > /tmp/config diff --git a/.github/workflows/test-jammy-dind.yml b/.github/workflows/test-jammy-dind.yml index 3e17221..af94a90 100644 --- a/.github/workflows/test-jammy-dind.yml +++ b/.github/workflows/test-jammy-dind.yml @@ -14,19 +14,19 @@ on: jobs: build: name: Build test image - runs-on: ubuntu-latest # use the GitHub-hosted runner to build the imag + runs-on: ubuntu-latest # use the GitHub-hosted runner to build the imag steps: - name: Checkout uses: actions/checkout@v4 - - name: Login to Docker Hub + - name: Login to GHCR uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - + - name: Build and push uses: docker/build-push-action@v5 with: @@ -36,7 +36,7 @@ jobs: deploy: name: Deploy test image to `test-runners` namespace - runs-on: ubuntu-latest # use the GitHub-hosted runner to deploy the image + runs-on: ubuntu-latest # use the GitHub-hosted runner to deploy the image needs: [build] environment: test @@ -44,6 +44,13 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Login to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Write out the kubeconfig info run: | echo ${{ secrets.DEPLOY_ACCOUNT }} | base64 -d > /tmp/config @@ -81,16 +88,16 @@ jobs: - name: Sudo fails uses: ./tests/sudo-fails - + - name: Docker tests uses: ./tests/docker - + - name: Container Action test uses: ./tests/container remove-deploy: name: Delete test image deployment - runs-on: ubuntu-latest # use the GitHub-hosted runner to remove the image + runs-on: ubuntu-latest # use the GitHub-hosted runner to remove the image needs: [test] environment: test if: always() diff --git a/.github/workflows/test-ubi8.yml b/.github/workflows/test-ubi8.yml index f73fe38..c5a0423 100644 --- a/.github/workflows/test-ubi8.yml +++ b/.github/workflows/test-ubi8.yml @@ -14,7 +14,7 @@ on: jobs: build: name: Build test image - runs-on: ubuntu-latest # use the GitHub-hosted runner to build the image + runs-on: ubuntu-latest # use the GitHub-hosted runner to build the image steps: - name: Checkout @@ -39,7 +39,7 @@ jobs: deploy: name: Deploy test image to `test-runners` namespace - runs-on: ubuntu-latest # use the GitHub-hosted runner to deploy the image + runs-on: ubuntu-latest # use the GitHub-hosted runner to deploy the image needs: [build] environment: test @@ -47,6 +47,13 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Login to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Write out the kubeconfig info run: | echo ${{ secrets.DEPLOY_ACCOUNT }} | base64 -d > /tmp/config @@ -87,7 +94,7 @@ jobs: remove-deploy: name: Delete test image deployment - runs-on: ubuntu-latest # use the GitHub-hosted runner to remove the image + runs-on: ubuntu-latest # use the GitHub-hosted runner to remove the image needs: [test] environment: test if: always() diff --git a/.github/workflows/test-ubi9.yml b/.github/workflows/test-ubi9.yml index 004cb9d..97d6be4 100644 --- a/.github/workflows/test-ubi9.yml +++ b/.github/workflows/test-ubi9.yml @@ -14,7 +14,7 @@ on: jobs: build: name: Build test image - runs-on: ubuntu-latest # use the GitHub-hosted runner to build the image + runs-on: ubuntu-latest # use the GitHub-hosted runner to build the image steps: - name: Checkout @@ -39,7 +39,7 @@ jobs: deploy: name: Deploy test image to `test-runners` namespace - runs-on: ubuntu-latest # use the GitHub-hosted runner to deploy the image + runs-on: ubuntu-latest # use the GitHub-hosted runner to deploy the image needs: [build] environment: test @@ -47,6 +47,13 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Login to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Write out the kubeconfig info run: | echo ${{ secrets.DEPLOY_ACCOUNT }} | base64 -d > /tmp/config @@ -87,7 +94,7 @@ jobs: remove-deploy: name: Delete test image deployment - runs-on: ubuntu-latest # use the GitHub-hosted runner to remove the image + runs-on: ubuntu-latest # use the GitHub-hosted runner to remove the image needs: [test] environment: test if: always() diff --git a/images/ghes-demo.Dockerfile b/images/ghes-demo.Dockerfile index c796e37..76f6176 100644 --- a/images/ghes-demo.Dockerfile +++ b/images/ghes-demo.Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 # GitHub runner arguments ARG RUNNER_ARCH=linux/amd64 -ARG RUNNER_VERSION=2.309.0 +ARG RUNNER_VERSION=2.310.2 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.4.0 # CodeQL arguments diff --git a/images/rootless-ubuntu-jammy.Dockerfile b/images/rootless-ubuntu-jammy.Dockerfile index d0e9bb8..52fe823 100644 --- a/images/rootless-ubuntu-jammy.Dockerfile +++ b/images/rootless-ubuntu-jammy.Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 # GitHub runner arguments ARG RUNNER_ARCH=linux/amd64 -ARG RUNNER_VERSION=2.309.0 +ARG RUNNER_VERSION=2.310.2 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.4.0 # Docker and Compose arguments diff --git a/images/ubi8.Dockerfile b/images/ubi8.Dockerfile index 96fb4a1..0f7f29f 100644 --- a/images/ubi8.Dockerfile +++ b/images/ubi8.Dockerfile @@ -10,7 +10,7 @@ LABEL org.opencontainers.image.documentation https://github.com/some-natalie/kub # Arguments ARG TARGETPLATFORM=linux/amd64 -ARG RUNNER_VERSION=2.309.0 +ARG RUNNER_VERSION=2.310.2 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.4.0 # Shell setup diff --git a/images/ubi9.Dockerfile b/images/ubi9.Dockerfile index a39426b..d8ef0b8 100644 --- a/images/ubi9.Dockerfile +++ b/images/ubi9.Dockerfile @@ -10,7 +10,7 @@ LABEL org.opencontainers.image.documentation https://github.com/some-natalie/kub # Arguments ARG TARGETPLATFORM=linux/amd64 -ARG RUNNER_VERSION=2.309.0 +ARG RUNNER_VERSION=2.310.2 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.4.0 # Shell setup