Skip to content

Commit

Permalink
Merge branch 'main' into feature/enable-artemis-tls
Browse files Browse the repository at this point in the history
Signed-off-by: Chirag Bhatia <[email protected]>
  • Loading branch information
chiragbhatia8 authored Jan 9, 2025
2 parents b40d166 + 3e87999 commit 9a03919
Show file tree
Hide file tree
Showing 5,543 changed files with 722,800 additions and 182,220 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

FROM golang:1.22.5
FROM golang:1.23.4

# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/3_bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ body:
label: KEDA Version
description: What version of KEDA that are you running?
options:
- "2.16.1"
- "2.16.0"
- "2.15.1"
- "2.15.0"
- "2.14.1"
Expand All @@ -65,10 +67,7 @@ body:
- "2.13.0"
- "2.12.1"
- "2.12.0"
- "2.11.2"
- "2.11.1"
- "2.11.0"
- "< 2.11.0"
- "< 2.12.0"
- "Other"
validations:
required: false
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/4_release_tracker.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: KEDA Release Tracker
about: Template to keep track of the progress for a new KEDA release.
title: "Release: "
labels: governance,release-management
assignees: tomkerkhove,zroubalik,jorturfer
assignees: wozniakjan,zroubalik,jorturfer
---

This issue template is used to track the rollout of a new KEDA version.
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/auto-add-issues-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ on:
issues:
types:
- opened

permissions:
contents: read

jobs:
track_issue:
runs-on: ubuntu-latest
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
pull_request:
branches: [main]

permissions:
contents: read

env:
fossa-key: 9e722f2c8904586d61f97f0bf05a99e4 # This is a public key only for pushing, it's safe here

Expand All @@ -17,20 +20,20 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5
with:
go-version: "1.22"
go-version: "1.23"
- run: go version
- name: Get branch name
id: branch-name
uses: tj-actions/branch-names@v8
- uses: fossas/fossa-action@main
uses: tj-actions/branch-names@6871f53176ad61624f978536bbf089c574dc19a2 # v8.0.1
- uses: fossas/fossa-action@09bcf127dc0ccb4b5a023f6f906728878e8610ba # v1.4.0
name: Scanning with FOSSA
with:
api-key: ${{ env.fossa-key }}
branch: ${{ steps.branch-name.outputs.current_branch }}
- uses: fossas/fossa-action@main
- uses: fossas/fossa-action@09bcf127dc0ccb4b5a023f6f906728878e8610ba # v1.4.0
name: Executing tests with FOSSA
with:
api-key: ${{ env.fossa-key }}
Expand Down
44 changes: 28 additions & 16 deletions .github/workflows/main-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ on:
push:
branches:
- main
permissions:
contents: read

jobs:
build:
name: build
Expand All @@ -13,10 +16,10 @@ jobs:
id-token: write # needed for signing the images with GitHub OIDC Token **not production ready**

# keda-tools is built from github.com/test-tools/tools/Dockerfile
container: ghcr.io/kedacore/keda-tools:1.22.5
container: ghcr.io/kedacore/keda-tools:1.23.3
steps:
- name: Check out code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
fetch-depth: 1

Expand All @@ -29,42 +32,42 @@ jobs:
echo "build_cache=$(go env GOCACHE)" >> $GITHUB_OUTPUT
- name: Go modules cache
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: ${{ steps.go-paths.outputs.mod_cache }}
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}

- name: Go build cache
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: ${{ steps.go-paths.outputs.build_cache }}
key: ${{ runner.os }}-go-build-cache-${{ hashFiles('**/go.sum') }}

- name: Go modules sync
run: go mod tidy -compat=1.22
run: go mod tidy -compat=1.23

- name: Test
run: make test

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
# Username used to log in to a Docker registry. If not set then no login will occur
username: ${{ github.repository_owner }}
# Password or personal access token used to log in to a Docker registry. If not set then no login will occur
password: ${{ secrets.GHCR_AUTH_PAT }}
password: ${{ secrets.GH_AUTOMATION_PAT }}
# Server address of Docker registry. If not set then will default to Docker Hub
registry: ghcr.io

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1

- name: Publish on GitHub Container Registry
run: make publish-multiarch

# https://github.com/sigstore/cosign-installer
- name: Install Cosign
uses: sigstore/cosign-installer@v3
uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0

- name: Check Cosign install!
run: cosign version
Expand All @@ -89,38 +92,47 @@ jobs:

trivy-scan:
needs: build
permissions:
contents: read
security-events: write
uses: kedacore/keda/.github/workflows/template-trivy-scan.yml@main
with:
runs-on: 'ubuntu-latest'
scan-type: 'fs'
format: 'sarif'
runs-on: ubuntu-latest
scan-type: "fs"
format: "sarif"
exit-code: 0
publish: true

trivy-scan-metrics-server:
needs: build
permissions:
contents: read
security-events: write
strategy:
matrix:
runner: [ARM64, ubuntu-latest]
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
permissions:
contents: read
security-events: write
strategy:
matrix:
runner: [ARM64, ubuntu-latest]
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
3 changes: 3 additions & 0 deletions .github/workflows/nightly-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ on:
schedule:
- cron: "0 0 * * *"

permissions:
contents: read

jobs:
validate:
uses: kedacore/keda/.github/workflows/template-main-e2e-test.yml@main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-e2e-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
31 changes: 16 additions & 15 deletions .github/workflows/pr-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ jobs:
triage:
runs-on: ubuntu-latest
name: Comment evaluate
container: ghcr.io/kedacore/keda-tools:1.23.3
outputs:
run-e2e: ${{ startsWith(github.event.comment.body,'/run-e2e') && steps.checkUserMember.outputs.isTeamMember == 'true' }}
pr_num: ${{ steps.parser.outputs.pr_num }}
image_tag: "pr-${{ steps.parser.outputs.pr_num }}-${{ steps.parser.outputs.commit_sha }}"
commit_sha: ${{ steps.parser.outputs.commit_sha }}
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

- uses: tspascoal/get-user-teams-membership@v2
- uses: tspascoal/get-user-teams-membership@57e9f42acd78f4d0f496b3be4368fc5f62696662 # v3.0.0
id: checkUserMember
with:
username: ${{ github.actor }}
Expand Down Expand Up @@ -68,7 +69,7 @@ jobs:
needs: triage
runs-on: ubuntu-latest
name: Build images
container: ghcr.io/kedacore/keda-tools:1.22.5
container: ghcr.io/kedacore/keda-tools:1.23.3
if: needs.triage.outputs.run-e2e == 'true'
steps:
- name: Set status in-progress
Expand All @@ -80,7 +81,7 @@ jobs:
status: in_progress
details_url: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}

- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

- name: Register workspace path
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand Down Expand Up @@ -108,7 +109,7 @@ jobs:
make e2e-regex-check
- name: React to comment with failure
uses: dkershner6/reaction-action@v2
uses: dkershner6/reaction-action@97ede302a1b145b3739dec3ca84a489a34ef48b5 # v2
if: steps.regex-validation.outcome != 'success'
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -130,12 +131,12 @@ jobs:
run: exit 1

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
# Username used to log in to a Docker registry. If not set then no login will occur
username: ${{ github.repository_owner }}
# Password or personal access token used to log in to a Docker registry. If not set then no login will occur
password: ${{ secrets.GHCR_AUTH_PAT }}
password: ${{ secrets.GH_AUTOMATION_PAT }}
# Server address of Docker registry. If not set then will default to Docker Hub
registry: ghcr.io

Expand All @@ -146,9 +147,9 @@ jobs:

run-test:
needs: [triage, build-test-images]
runs-on: equinix-keda-runner
runs-on: e2e
name: Execute e2e tests
container: ghcr.io/kedacore/keda-tools:1.22.5
container: ghcr.io/kedacore/keda-tools:1.23.3
if: needs.triage.outputs.run-e2e == 'true'
steps:
- name: Set status in-progress
Expand All @@ -160,7 +161,7 @@ jobs:
status: in_progress
details_url: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}

- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

- name: Register workspace path
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
Expand All @@ -173,14 +174,14 @@ jobs:
gh pr checkout ${{ needs.triage.outputs.pr_num }}
git checkout ${{ needs.triage.outputs.commit_sha }}
- uses: oNaiPs/secrets-to-env-action@v1
- uses: oNaiPs/secrets-to-env-action@ec46a22bfc9b37e014b627b3208b07eb8909ea0f # v1.5
with:
secrets: ${{ toJSON(secrets) }}

- name: Scale cluster
run: make scale-node-pool
env:
NODE_POOL_SIZE: 2
NODE_POOL_SIZE: 3
TEST_CLUSTER_NAME: keda-e2e-cluster-pr

- name: Run end to end tests
Expand Down Expand Up @@ -218,7 +219,7 @@ jobs:
TEST_CLUSTER_NAME: keda-e2e-cluster-pr

- name: React to comment with success
uses: dkershner6/reaction-action@v2
uses: dkershner6/reaction-action@97ede302a1b145b3739dec3ca84a489a34ef48b5 # v2
if: steps.test.outcome == 'success'
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -236,7 +237,7 @@ jobs:
details_url: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}

- name: React to comment with failure
uses: dkershner6/reaction-action@v2
uses: dkershner6/reaction-action@97ede302a1b145b3739dec3ca84a489a34ef48b5 # v2
if: steps.test.outcome != 'success'
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -254,7 +255,7 @@ jobs:
details_url: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}

- name: Upload test logs
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
with:
name: e2e-test-logs
path: "${{ github.workspace }}/**/*.log"
Expand Down
Loading

0 comments on commit 9a03919

Please sign in to comment.