Skip to content

Commit

Permalink
Merge branch 'main' into fallback-validation
Browse files Browse the repository at this point in the history
  • Loading branch information
JorTurFer authored Nov 3, 2024
2 parents 10b37cc + 1880cdb commit 480573b
Show file tree
Hide file tree
Showing 83 changed files with 2,928 additions and 1,957 deletions.
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: equinix-2cpu-8gb
runs-on: ubuntu-latest
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: equinix-4cpu-16gb
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
Expand Down
8 changes: 4 additions & 4 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: equinix-4cpu-16gb
runs-on: ARM64
permissions:
contents: read
packages: write
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
needs: build
uses: kedacore/keda/.github/workflows/template-trivy-scan.yml@main
with:
runs-on: equinix-4cpu-16gb
runs-on: ubuntu-latest
scan-type: "fs"
format: "sarif"
exit-code: 0
Expand All @@ -101,7 +101,7 @@ jobs:
needs: build
strategy:
matrix:
runner: [oracle-aarch64-4cpu-16gb, equinix-4cpu-16gb]
runner: [ARM64, ubuntu-latest]
uses: kedacore/keda/.github/workflows/template-trivy-scan.yml@main
with:
runs-on: ${{ matrix.runner }}
Expand All @@ -115,7 +115,7 @@ jobs:
needs: build
strategy:
matrix:
runner: [oracle-aarch64-4cpu-16gb, equinix-4cpu-16gb]
runner: [ARM64, ubuntu-latest]
uses: kedacore/keda/.github/workflows/template-trivy-scan.yml@main
with:
runs-on: ${{ matrix.runner }}
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 @@ -16,7 +16,7 @@ concurrency:
jobs:
e2e-checker:
name: label checker
runs-on: equinix-2cpu-8gb
runs-on: ubuntu-latest
steps:
- uses: LouisBrunner/checks-action@6b626ffbad7cc56fd58627f774b9067e6118af23 # v2
name: Enqueue e2e
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: equinix-2cpu-8gb
runs-on: ubuntu-latest
steps:
- uses: LouisBrunner/checks-action@6b626ffbad7cc56fd58627f774b9067e6118af23 # v2
name: Enqueue e2e
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/pr-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ env:

jobs:
triage:
runs-on: equinix-2cpu-8gb
runs-on: ubuntu-latest
name: Comment evaluate
container: ghcr.io/kedacore/keda-tools:1.22.5
outputs:
run-e2e: ${{ startsWith(github.event.comment.body,'/run-e2e') && steps.checkUserMember.outputs.isTeamMember == 'true' }}
pr_num: ${{ steps.parser.outputs.pr_num }}
Expand Down Expand Up @@ -66,7 +67,7 @@ jobs:
build-test-images:
needs: triage
runs-on: equinix-4cpu-16gb
runs-on: ubuntu-latest
name: Build images
container: ghcr.io/kedacore/keda-tools:1.22.5
if: needs.triage.outputs.run-e2e == 'true'
Expand Down Expand Up @@ -146,7 +147,7 @@ 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
if: needs.triage.outputs.run-e2e == 'true'
Expand Down Expand Up @@ -180,7 +181,7 @@ jobs:
- 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
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: oracle-aarch64-4cpu-16gb
- runner: ARM64
name: arm64
- runner: equinix-4cpu-16gb
- runner: ubuntu-latest
name: amd64
steps:
- name: Check out code
Expand Down Expand Up @@ -81,9 +81,9 @@ jobs:
strategy:
matrix:
include:
- runner: oracle-aarch64-4cpu-16gb
- runner: ARM64
name: arm64
- runner: equinix-4cpu-16gb
- runner: ubuntu-latest
name: amd64
steps:
- name: Check out code
Expand Down Expand Up @@ -112,9 +112,9 @@ jobs:
strategy:
matrix:
include:
- runner: oracle-aarch64-4cpu-16gb
- runner: ARM64
name: arm64
- runner: equinix-4cpu-16gb
- runner: ubuntu-latest
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: equinix-4cpu-16gb
runs-on: ubuntu-latest
scan-type: "fs"
format: "table"
output: ""
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-welcome.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:
jobs:
pr_bot:
name: PR Bot
runs-on: equinix-2cpu-8gb
runs-on: ubuntu-latest
steps:
- name: "Add welcome comment on PR #${{ github.event.number }} (draft)"
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
build:
name: Push Release
runs-on: equinix-4cpu-16gb
runs-on: ARM64
permissions:
contents: write
packages: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
jobs:
codeQl:
name: Analyze CodeQL Go
runs-on: equinix-4cpu-16gb
runs-on: ubuntu-latest
container: ghcr.io/kedacore/keda-tools:1.22.5
if: (github.actor != 'dependabot[bot]')
steps:
Expand Down
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: equinix-4cpu-16gb
runs-on: ubuntu-latest
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: oracle-aarch64-4cpu-16gb
runs-on: ARM64
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: oracle-aarch64-4cpu-16gb
runs-on: ARM64
# 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 @@ -26,7 +26,7 @@ jobs:
- name: Scale cluster
run: make scale-node-pool
env:
NODE_POOL_SIZE: 2
NODE_POOL_SIZE: 3

- name: Run end to end tests
env:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/template-trivy-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ jobs:

- name: Run Trivy
uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0
env:
TRIVY_DB_REPOSITORY: ghcr.io/kedacore/trivy-db
with:
scan-type: ${{ inputs.scan-type }}
image-ref: ${{ inputs.image-ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/template-versions-smoke-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
smoke-tests:
name: equinix-4cpu-16gb
name: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand All @@ -19,6 +19,6 @@ jobs:
kindImage: kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0
uses: kedacore/keda/.github/workflows/template-smoke-tests.yml@main
with:
runs-on: equinix-4cpu-16gb
runs-on: ubuntu-latest
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: equinix-2cpu-8gb
runs-on: ubuntu-latest
container: kedacore/build-tools:v1
steps:
- name: Check out code
Expand Down
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,13 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio

### New

- **General**: Add the generateEmbeddedObjectMeta flag to generate meta properties of JobTargetRef in ScaledJob ([#5908](https://github.com/kedacore/keda/issues/5908))
- **General**: Cache miss fallback in validating webhook for ScaledObjects with direct kubernetes client ([#5973](https://github.com/kedacore/keda/issues/5973))
- **CloudEventSource**: Introduce ClusterCloudEventSource ([#3533](https://github.com/kedacore/keda/issues/3533))
- **CloudEventSource**: Provide ClusterCloudEventSource around the management of ScaledJobs resources ([#3523](https://github.com/kedacore/keda/issues/3523))
- **CloudEventSource**: Provide ClusterCloudEventSource around the management of TriggerAuthentication/ClusterTriggerAuthentication resources ([#3524](https://github.com/kedacore/keda/issues/3524))
- **Github Action**: Fix panic when env for runnerScopeFromEnv or ownerFromEnv is empty ([#6156](https://github.com/kedacore/keda/issues/6156))
- **RabbitMQ Scaler**: provide separate paremeters for user and password ([#2513](https://github.com/kedacore/keda/issues/2513))

#### Experimental

Expand All @@ -69,13 +73,18 @@ Here is an overview of all new **experimental** features:

### Improvements

- **General**: Prevent multiple ScaledObjects managing one HPA ([#6130](https://github.com/kedacore/keda/issues/6130))
- **AWS CloudWatch Scaler**: Add support for ignoreNullValues ([#5352](https://github.com/kedacore/keda/issues/5352))
- **Elasticsearch Scaler**: Support Query at the Elasticsearch scaler ([#6216](https://github.com/kedacore/keda/issues/6216))
- **Etcd Scaler**: Add username and password support for etcd ([#6199](https://github.com/kedacore/keda/pull/6199))
- **GCP Scalers**: Added custom time horizon in GCP scalers ([#5778](https://github.com/kedacore/keda/issues/5778))
- **GitHub Scaler**: Fixed pagination, fetching repository list ([#5738](https://github.com/kedacore/keda/issues/5738))
- **Grafana dashboard**: Fix dashboard to handle wildcard scaledObject variables ([#6214](https://github.com/kedacore/keda/issues/6214))
- **Kafka**: Allow disabling FAST negotation when using Kerberos ([#6188](https://github.com/kedacore/keda/issues/6188))
- **Kafka**: Fix logic to scale to zero on invalid offset even with earliest offsetResetPolicy ([#5689](https://github.com/kedacore/keda/issues/5689))
- **RabbitMQ Scaler**: Add connection name for AMQP ([#5958](https://github.com/kedacore/keda/issues/5958))
- **Selenium Scaler**: Add Support for Username and Password Authentication ([#6144](https://github.com/kedacore/keda/issues/6144))
- **Selenium Scaler**: Introduce new parameters setSessionsFromHub, sessionsPerNode and sessionBrowserVersion. ([#6080](https://github.com/kedacore/keda/issues/6080))
- TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))

### Fixes
Expand All @@ -101,7 +110,7 @@ New deprecation(s):

### Other

- TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
- **Cron scaler**: Simplify cron scaler code ([#6056](https://github.com/kedacore/keda/issues/6056))

## v2.15.1

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ smoke-test: ## Run e2e tests against Kubernetes cluster configured in ~/.kube/co
##@ Development

manifests: controller-gen ## Generate ClusterRole and CustomResourceDefinition objects.
$(CONTROLLER_GEN) crd:crdVersions=v1 rbac:roleName=keda-operator paths="./..." output:crd:artifacts:config=config/crd/bases
$(CONTROLLER_GEN) crd:crdVersions=v1,generateEmbeddedObjectMeta=true rbac:roleName=keda-operator paths="./..." output:crd:artifacts:config=config/crd/bases
# withTriggers is only used for duck typing so we only need the deepcopy methods
# However operator-sdk generate doesn't appear to have an option for that
# until this issue is fixed: https://github.com/kubernetes-sigs/controller-tools/issues/398
Expand Down
Loading

0 comments on commit 480573b

Please sign in to comment.