From c285e00baf82a0ea08f34107f3edd9286fd2a55a Mon Sep 17 00:00:00 2001 From: Jorge Turrado Date: Sun, 1 Oct 2023 21:15:26 +0200 Subject: [PATCH 1/3] chore: Improve the CI on PRs to be more efficient Signed-off-by: Jorge Turrado --- .github/workflows/ci-core.yml | 11 +++++------ .../workflows/ci-external-scaler-azure-cosmos-db.yml | 4 ++++ .github/workflows/ci-http-add-on.yml | 4 ++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml index d3d5d9a7..80cc3f1b 100644 --- a/.github/workflows/ci-core.yml +++ b/.github/workflows/ci-core.yml @@ -16,6 +16,10 @@ on: - '.github/workflows/ci-core.yml' - 'keda/**' +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + jobs: lint-helm-3-x: name: Lint Helm Chart @@ -38,7 +42,7 @@ jobs: fail-fast: false matrix: enableAzureWorkloadIdentity: [false, true] - kubernetesVersion: [v1.28, v1.27, v1.26, v1.25] + kubernetesVersion: [v1.28, v1.26] namespace: ["keda", "not-keda"] enableCertManager: [false, true] include: @@ -53,13 +57,8 @@ jobs: # See https://github.com/kubernetes-sigs/kind/releases - kubernetesVersion: v1.28 kindImage: kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 - - kubernetesVersion: v1.27 - kindImage: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 - kubernetesVersion: v1.26 kindImage: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb - - kubernetesVersion: v1.25 - kindImage: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8 - steps: - name: Check out code uses: actions/checkout@v2 diff --git a/.github/workflows/ci-external-scaler-azure-cosmos-db.yml b/.github/workflows/ci-external-scaler-azure-cosmos-db.yml index abfc7d07..857092b5 100644 --- a/.github/workflows/ci-external-scaler-azure-cosmos-db.yml +++ b/.github/workflows/ci-external-scaler-azure-cosmos-db.yml @@ -14,6 +14,10 @@ on: - .github/workflows/ci-external-scaler-azure-cosmos-db.yml - external-scaler-azure-cosmos-db/** +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + jobs: lint-helm-3-x: name: Lint Helm Chart diff --git a/.github/workflows/ci-http-add-on.yml b/.github/workflows/ci-http-add-on.yml index be5a2d89..d0a9247e 100644 --- a/.github/workflows/ci-http-add-on.yml +++ b/.github/workflows/ci-http-add-on.yml @@ -15,6 +15,10 @@ on: - '.github/workflows/ci-http-add-on.yml' - 'http-add-on/**' +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + jobs: lint-helm-3-x: name: Lint Helm Chart From f6498cccc92c7f92250054ea04edc2793afafde4 Mon Sep 17 00:00:00 2001 From: Jorge Turrado Date: Sun, 1 Oct 2023 22:03:53 +0200 Subject: [PATCH 2/3] reduce version matrix Signed-off-by: Jorge Turrado --- .../ci-external-scaler-azure-cosmos-db.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/ci-external-scaler-azure-cosmos-db.yml b/.github/workflows/ci-external-scaler-azure-cosmos-db.yml index 857092b5..e908149c 100644 --- a/.github/workflows/ci-external-scaler-azure-cosmos-db.yml +++ b/.github/workflows/ci-external-scaler-azure-cosmos-db.yml @@ -39,26 +39,14 @@ jobs: strategy: fail-fast: false matrix: - kubernetesVersion: [v1.24, v1.23, v1.22, v1.21, v1.20, v1.19, v1.18, v1.17] + kubernetesVersion: [v1.24, v1.19] include: # Images are defined on every Kind release # See https://github.com/kubernetes-sigs/kind/releases - kubernetesVersion: v1.24 kindImage: kindest/node:v1.24.0@sha256:406fd86d48eaf4c04c7280cd1d2ca1d61e7d0d61ddef0125cb097bc7b82ed6a1 - - kubernetesVersion: v1.23 - kindImage: kindest/node:v1.23.6@sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355 - - kubernetesVersion: v1.22 - kindImage: kindest/node:v1.22.9@sha256:6e57a6b0c493c7d7183a1151acff0bfa44bf37eb668826bf00da5637c55b6d5e - - kubernetesVersion: v1.21 - kindImage: kindest/node:v1.21.12@sha256:ae05d44cc636ee961068399ea5123ae421790f472c309900c151a44ee35c3e3e - - kubernetesVersion: v1.20 - kindImage: kindest/node:v1.20.15@sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3 - kubernetesVersion: v1.19 kindImage: kindest/node:v1.19.16@sha256:dec41184d10deca01a08ea548197b77dc99eeacb56ff3e371af3193c86ca99f4 - - kubernetesVersion: v1.18 - kindImage: kindest/node:v1.18.20@sha256:38a8726ece5d7867fb0ede63d718d27ce2d41af519ce68be5ae7fcca563537ed - - kubernetesVersion: v1.17 - kindImage: kindest/node:v1.17.17@sha256:66f1d0d91a88b8a001811e2f1054af60eef3b669a9a74f9b6db871f2f1eeed00 steps: - name: Check out code uses: actions/checkout@v2 From de90e06f2f8f84b5d08245372291f9a4124710cb Mon Sep 17 00:00:00 2001 From: Jorge Turrado Date: Mon, 2 Oct 2023 17:44:01 +0200 Subject: [PATCH 3/3] update core versions Signed-off-by: Jorge Turrado --- .github/workflows/ci-core.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml index 80cc3f1b..a61cb5f8 100644 --- a/.github/workflows/ci-core.yml +++ b/.github/workflows/ci-core.yml @@ -42,7 +42,7 @@ jobs: fail-fast: false matrix: enableAzureWorkloadIdentity: [false, true] - kubernetesVersion: [v1.28, v1.26] + kubernetesVersion: [v1.28, v1.27, v1.26, v1.23] namespace: ["keda", "not-keda"] enableCertManager: [false, true] include: @@ -57,8 +57,12 @@ jobs: # See https://github.com/kubernetes-sigs/kind/releases - kubernetesVersion: v1.28 kindImage: kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 + - kubernetesVersion: v1.27 + kindImage: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 - kubernetesVersion: v1.26 kindImage: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb + - kubernetesVersion: v1.23 + kindImage: kindest/node:v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb steps: - name: Check out code uses: actions/checkout@v2