Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use CNCF Runners #5994

Merged
merged 2 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto-add-issues-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- opened
jobs:
track_issue:
runs-on: ubuntu-latest
runs-on: equinix-2cpu-8gb
steps:
- name: Get project data
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:

jobs:
build:
runs-on: ubuntu-latest
runs-on: equinix-4cpu-16gb
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/main-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
build:
name: build
runs-on: ARM64
runs-on: oracle-aarch64-4cpu-16gb
permissions:
contents: read
packages: write
Expand Down Expand Up @@ -91,36 +91,36 @@ jobs:
needs: build
uses: kedacore/keda/.github/workflows/template-trivy-scan.yml@main
with:
runs-on: 'ubuntu-latest'
scan-type: 'fs'
format: 'sarif'
runs-on: equinix-4cpu-16gb
scan-type: "fs"
format: "sarif"
exit-code: 0
publish: true

trivy-scan-metrics-server:
needs: build
strategy:
matrix:
runner: [ARM64, ubuntu-latest]
runner: [oracle-aarch64-4cpu-16gb, equinix-4cpu-16gb]
uses: kedacore/keda/.github/workflows/template-trivy-scan.yml@main
with:
runs-on: ${{ matrix.runner }}
scan-type: 'image'
scan-type: "image"
image-ref: ghcr.io/kedacore/keda-metrics-apiserver:main
format: 'sarif'
format: "sarif"
exit-code: 0
publish: true

trivy-scan-keda:
needs: build
strategy:
matrix:
runner: [ARM64, ubuntu-latest]
runner: [oracle-aarch64-4cpu-16gb, equinix-4cpu-16gb]
uses: kedacore/keda/.github/workflows/template-trivy-scan.yml@main
with:
runs-on: ${{ matrix.runner }}
scan-type: 'image'
scan-type: "image"
image-ref: ghcr.io/kedacore/keda:main
format: 'sarif'
format: "sarif"
exit-code: 0
publish: true
4 changes: 2 additions & 2 deletions .github/workflows/pr-e2e-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ concurrency:
jobs:
e2e-checker:
name: label checker
runs-on: ubuntu-latest
runs-on: equinix-2cpu-8gb
steps:
- uses: LouisBrunner/checks-action@6b626ffbad7cc56fd58627f774b9067e6118af23 # v2
name: Enqueue e2e
Expand All @@ -29,7 +29,7 @@ jobs:

- uses: LouisBrunner/checks-action@6b626ffbad7cc56fd58627f774b9067e6118af23 # v2
name: Skip e2e
if: ${{ contains(github.event.pull_request.labels.*.name, env.SKIP_E2E_TAG )}}
if: ${{ contains(github.event.pull_request.labels.*.name, env.SKIP_E2E_TAG )}}
with:
token: ${{ secrets.GITHUB_TOKEN }}
sha: ${{ github.event.pull_request.head.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-e2e-creator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ concurrency:
jobs:
check-creator:
name: check-creator
runs-on: ubuntu-latest
runs-on: equinix-2cpu-8gb
steps:
- uses: LouisBrunner/checks-action@6b626ffbad7cc56fd58627f774b9067e6118af23 # v2
name: Enqueue e2e
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:

jobs:
triage:
runs-on: ubuntu-latest
runs-on: equinix-2cpu-8gb
name: Comment evaluate
outputs:
run-e2e: ${{ startsWith(github.event.comment.body,'/run-e2e') && steps.checkUserMember.outputs.isTeamMember == 'true' }}
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
build-test-images:
needs: triage
runs-on: ubuntu-latest
runs-on: equinix-4cpu-16gb
name: Build images
container: ghcr.io/kedacore/keda-tools:1.22.5
if: needs.triage.outputs.run-e2e == 'true'
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
strategy:
matrix:
include:
- runner: ARM64
- runner: oracle-aarch64-4cpu-16gb
name: arm64
- runner: ubuntu-latest
- runner: equinix-4cpu-16gb
name: amd64
steps:
- name: Check out code
Expand Down Expand Up @@ -81,9 +81,9 @@ jobs:
strategy:
matrix:
include:
- runner: ARM64
- runner: oracle-aarch64-4cpu-16gb
name: arm64
- runner: ubuntu-latest
- runner: equinix-4cpu-16gb
name: amd64
steps:
- name: Check out code
Expand Down Expand Up @@ -112,9 +112,9 @@ jobs:
strategy:
matrix:
include:
- runner: ARM64
- runner: oracle-aarch64-4cpu-16gb
name: arm64
- runner: ubuntu-latest
- runner: equinix-4cpu-16gb
name: amd64
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
trivy-scan:
uses: kedacore/keda/.github/workflows/template-trivy-scan.yml@main
with:
runs-on: "ubuntu-latest"
runs-on: equinix-4cpu-16gb
scan-type: "fs"
format: "table"
output: ""
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pr-welcome.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request_target:
types: [opened, ready_for_review]
branches:
- 'main'
- "main"
pull_request_review:
types: [submitted, edited]

Expand All @@ -15,9 +15,9 @@ permissions:
jobs:
pr_bot:
name: PR Bot
runs-on: ubuntu-latest
runs-on: equinix-2cpu-8gb
steps:
- name: 'Add welcome comment on PR #${{ github.event.number }} (draft)'
- name: "Add welcome comment on PR #${{ github.event.number }} (draft)"
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
if: github.event_name == 'pull_request_target' && github.event.pull_request.action == 'opened' && github.event.pull_request.draft
with:
Expand All @@ -29,7 +29,7 @@ jobs:
issue_number: ${{ github.event.number }},
body: 'Thank you for your contribution! 🙏 Let us know when you are ready for a review by publishing the PR.'
});
- name: 'Add welcome comment on PR #${{ github.event.number }}'
- name: "Add welcome comment on PR #${{ github.event.number }}"
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
if: github.event_name == 'pull_request_target' && (github.event.pull_request.action == 'opened' || github.event.pull_request.action == 'ready_for_review')
with:
Expand All @@ -41,7 +41,7 @@ jobs:
issue_number: ${{ github.event.number }},
body: 'Thank you for your contribution! 🙏 We will review your PR as soon as possible.\n\n\n While you are waiting, make sure to:\n\n\n- Add an entry in [our changelog](https://github.com/kedacore/keda/blob/main/CHANGELOG.md) in alphabetical order and link related issue\n- Update the [documentation](https://github.com/kedacore/keda-docs), if needed\n- Add unit & [e2e](https://github.com/kedacore/keda/blob/main/tests/README.md) tests for your changes\n- GitHub checks are passing\n- Is the DCO check failing? Here is [how you can fix DCO issues](https://github.com/kedacore/keda/blob/main/CONTRIBUTING.md#i-didnt-sign-my-commit-now-what)\n\n\nLearn more about:\n- Our [contribution guide](https://github.com/kedacore/keda/blob/main/CONTRIBUTING.md)'
});
- name: 'Apply review required label'
- name: "Apply review required label"
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
if: github.event_name == 'pull_request_target' && (github.event.pull_request.action == 'opened'|| github.event.pull_request.action == 'ready_for_review')
with:
Expand All @@ -52,7 +52,7 @@ jobs:
repo: context.repo.repo,
labels: ["requires-pr-review"]
})
- name: 'Remove review required label'
- name: "Remove review required label"
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
if: github.event_name == 'pull_request_review' && (github.event.review.state == 'submitted' || github.event.review.state == 'edited')
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: release-build
on:
push:
tags:
- 'v*'
- "v*"
jobs:
build:
name: Push Release
runs-on: ARM64
runs-on: oracle-aarch64-4cpu-16gb
permissions:
contents: write
packages: write
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/static-analysis-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "CodeQL"

on:
push:
branches: [ "main" ]
branches: ["main"]
pull_request: {}

concurrency:
Expand All @@ -12,26 +12,26 @@ concurrency:
jobs:
codeQl:
name: Analyze CodeQL Go
runs-on: ubuntu-latest
runs-on: equinix-4cpu-16gb
container: ghcr.io/kedacore/keda-tools:1.22.5
if: (github.actor != 'dependabot[bot]')
steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- name: Register workspace path
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- name: Register workspace path
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: go
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
queries: +security-and-quality
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: go
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
queries: +security-and-quality

- name: Autobuild
uses: github/codeql-action/autobuild@v3
- name: Autobuild
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:go"
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:go"
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis-semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
jobs:
semgrep:
name: Analyze Semgrep
runs-on: ubuntu-latest
runs-on: equinix-4cpu-16gb
container: returntocorp/semgrep
if: (github.actor != 'dependabot[bot]')
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/template-arm64-smoke-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
concurrency: arm-smoke-tests
uses: kedacore/keda/.github/workflows/template-smoke-tests.yml@main
with:
runs-on: ARM64
runs-on: oracle-aarch64-4cpu-16gb
kubernetesVersion: v1.30
kindImage: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
4 changes: 2 additions & 2 deletions .github/workflows/template-main-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
e2e-tests:
name: Run e2e test
runs-on: ARM64
runs-on: oracle-aarch64-4cpu-16gb
# keda-tools is built from github.com/test-tools/tools/Dockerfile
container: ghcr.io/kedacore/keda-tools:1.22.5
concurrency: e2e-tests
Expand All @@ -33,7 +33,7 @@ jobs:
AWS_RUN_IDENTITY_TESTS: true
AZURE_RUN_WORKLOAD_IDENTITY_TESTS: true
GCP_RUN_IDENTITY_TESTS: true
ENABLE_OPENTELEMETRY : true
ENABLE_OPENTELEMETRY: true
run: make e2e-test

- name: Delete all e2e related namespaces
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/template-versions-smoke-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ on:

jobs:
smoke-tests:
name: ubuntu-latest
name: equinix-4cpu-16gb
strategy:
fail-fast: false
matrix:
kubernetesVersion: [v1.30, v1.29, v1.28]
include:
- kubernetesVersion: v1.30
kindImage: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
- kubernetesVersion: v1.29
kindImage: kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8
- kubernetesVersion: v1.28
kindImage: kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0
- kubernetesVersion: v1.30
kindImage: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
- kubernetesVersion: v1.29
kindImage: kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8
- kubernetesVersion: v1.28
kindImage: kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0
uses: kedacore/keda/.github/workflows/template-smoke-tests.yml@main
with:
runs-on: ubuntu-latest
runs-on: equinix-4cpu-16gb
kubernetesVersion: ${{ matrix.kubernetesVersion }}
kindImage: ${{ matrix.kindImage }}
2 changes: 1 addition & 1 deletion .github/workflows/v1-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
validate:
name: Validate
runs-on: ubuntu-latest
runs-on: equinix-2cpu-8gb
container: kedacore/build-tools:v1
steps:
- name: Check out code
Expand Down
Loading