Skip to content

Commit af10bf6

Browse files
wozniakjanwozniakjan
committed
Merge branch 'main' into instrument-http-add-on-operator
Signed-off-by: Jan Wozniak <[email protected]>
2 parents 1e8e24a + 70a640a commit af10bf6

File tree

14 files changed

+72
-45
lines changed

14 files changed

+72
-45
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
44
#-------------------------------------------------------------------------------------------------------------
55

6-
FROM golang:1.24.3
6+
FROM golang:1.24.7
77

88
# Avoid warnings by switching to noninteractive
99
ENV DEBIAN_FRONTEND=noninteractive

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ _Provide a description of what has been changed_
1111
- [ ] Commits are signed with Developer Certificate of Origin (DCO)
1212
- [ ] Changelog has been updated and is aligned with our [changelog requirements](https://github.com/kedacore/keda/blob/main/CONTRIBUTING.md#Changelog)
1313
- [ ] Any necessary documentation is added, such as:
14-
- [`README.md`](/README.md)
14+
- [`README.md`](../README.md)
1515
- [The `docs/` directory](./docs)
1616
- [The docs repo](https://github.com/kedacore/keda-docs)
1717

‎.github/workflows/build_canary.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
packages: write
1717
id-token: write # needed for signing the images with GitHub OIDC Token **not production ready**
1818

19-
container: ghcr.io/kedacore/keda-tools:1.24.3
19+
container: ghcr.io/kedacore/keda-tools:1.24.7
2020
steps:
2121
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
2222

2323
- name: Register workspace path
2424
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
2525

2626
- name: Login to GHCR
27-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
27+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
2828
with:
2929
# Username used to log in to a Docker registry. If not set then no login will occur
3030
username: ${{ github.repository_owner }}
@@ -43,7 +43,7 @@ jobs:
4343

4444
# https://github.com/sigstore/cosign-installer
4545
- name: Install Cosign
46-
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
46+
uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
4747

4848
- name: Check Cosign install!
4949
run: cosign version

‎.github/workflows/build_release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
packages: write
1313
id-token: write # needed for signing the images with GitHub OIDC Token **not production ready**
1414

15-
container: ghcr.io/kedacore/keda-tools:1.24.3
15+
container: ghcr.io/kedacore/keda-tools:1.24.7
1616
steps:
1717
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
1818

@@ -30,7 +30,7 @@ jobs:
3030
VERSION: ${{ steps.get_version.outputs.VERSION }}
3131

3232
- name: Login to GHCR
33-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
33+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
3434
with:
3535
# Username used to log in to a Docker registry. If not set then no login will occur
3636
username: ${{ github.repository_owner }}
@@ -49,7 +49,7 @@ jobs:
4949

5050
# https://github.com/sigstore/cosign-installer
5151
- name: Install Cosign
52-
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
52+
uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
5353

5454
- name: Check Cosign install!
5555
run: cosign version

‎.github/workflows/e2e-tests.yaml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
kubernetesVersion: [v1.32, v1.31, v1.30]
22+
kubernetesVersion: [v1.33, v1.32, v1.31]
2323
include:
24+
- kubernetesVersion: v1.33
25+
kindImage: kindest/node:v1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2
2426
- kubernetesVersion: v1.32
25-
kindImage: kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
27+
kindImage: kindest/node:v1.32.8@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1
2628
- kubernetesVersion: v1.31
27-
kindImage: kindest/node:v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30
28-
- kubernetesVersion: v1.30
29-
kindImage: kindest/node:v1.30.8@sha256:17cd608b3971338d9180b00776cb766c50d0a0b6b904ab4ff52fd3fc5c6369bf
29+
kindImage: kindest/node:v1.31.12@sha256:0f5cc49c5e73c0c2bb6e2df56e7df189240d83cf94edfa30946482eb08ec57d2
3030
steps:
3131
- name: Install prerequisites
3232
run: |
@@ -37,18 +37,19 @@ jobs:
3737

3838
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
3939

40-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
40+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
4141
with:
42-
go-version: "1.24"
42+
go-version: "1.24.7"
4343

4444
- name: Helm install
45-
uses: Azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
45+
uses: Azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
4646

4747
- name: Create k8s ${{ matrix.kubernetesVersion }} Kind Cluster
4848
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
4949
with:
5050
node_image: ${{ matrix.kindImage }}
5151
cluster_name: cluster
52+
version: v0.30.0
5253

5354
- name: Generate images and push to the cluster
5455
run: |
@@ -96,29 +97,30 @@ jobs:
9697
strategy:
9798
fail-fast: false
9899
matrix:
99-
kubernetesVersion: [v1.32, v1.31, v1.30]
100+
kubernetesVersion: [v1.33, v1.32, v1.31]
100101
include:
102+
- kubernetesVersion: v1.33
103+
kindImage: kindest/node:v1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2
101104
- kubernetesVersion: v1.32
102-
kindImage: kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
105+
kindImage: kindest/node:v1.32.8@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1
103106
- kubernetesVersion: v1.31
104-
kindImage: kindest/node:v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30
105-
- kubernetesVersion: v1.30
106-
kindImage: kindest/node:v1.30.8@sha256:17cd608b3971338d9180b00776cb766c50d0a0b6b904ab4ff52fd3fc5c6369bf
107+
kindImage: kindest/node:v1.31.12@sha256:0f5cc49c5e73c0c2bb6e2df56e7df189240d83cf94edfa30946482eb08ec57d2
107108
steps:
108109
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
109110

110-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
111+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
111112
with:
112-
go-version: "1.24"
113+
go-version: "1.24.7"
113114

114115
- name: Helm install
115-
uses: Azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
116+
uses: Azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
116117

117118
- name: Create k8s ${{ matrix.kubernetesVersion }} Kind Cluster
118119
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
119120
with:
120121
node_image: ${{ matrix.kindImage }}
121122
cluster_name: ${{ runner.name }}
123+
version: v0.30.0
122124

123125
- name: Push images to the cluster
124126
run: |

‎.github/workflows/images.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313
jobs:
1414
build_scaler:
1515
runs-on: ubuntu-latest
16-
container: ghcr.io/kedacore/keda-tools:1.24.3
16+
container: ghcr.io/kedacore/keda-tools:1.24.7
1717
steps:
1818
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
1919
- name: Register workspace path
@@ -25,7 +25,7 @@ jobs:
2525
2626
build_operator:
2727
runs-on: ubuntu-latest
28-
container: ghcr.io/kedacore/keda-tools:1.24.3
28+
container: ghcr.io/kedacore/keda-tools:1.24.7
2929
steps:
3030
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
3131
- name: Register workspace path
@@ -37,7 +37,7 @@ jobs:
3737
3838
build_interceptor:
3939
runs-on: ubuntu-latest
40-
container: ghcr.io/kedacore/keda-tools:1.24.3
40+
container: ghcr.io/kedacore/keda-tools:1.24.7
4141
steps:
4242
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
4343
- name: Register workspace path

‎.github/workflows/linkinator.yaml‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,30 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
20-
- uses: JustinBeckwith/linkinator-action@3d5ba091319fa7b0ac14703761eebb7d100e6f6d # v1
20+
- name: Restore lychee cache
21+
uses: actions/cache@v4
2122
with:
22-
paths: "**/*.md"
23-
markdown: true
24-
concurrency: 1
25-
retry: true
26-
linksToSkip: "https://github.com/kedacore/http-add-on/pkgs/container/http-add-on-interceptor, https://github.com/kedacore/http-add-on/pkgs/container/http-add-on-operator, https://github.com/kedacore/http-add-on/pkgs/container/http-add-on-scaler,http://opentelemetry-collector.open-telemetry-system:4318,http://opentelemetry-collector.open-telemetry-system:4318/v1/traces, https://www.gnu.org/software/make/, http://opentelemetry-collector.open-telemetry-system:4317"
23+
path: .lycheecache
24+
key: cache-lychee-${{ github.sha }}
25+
restore-keys: cache-lychee-
26+
- name: Run lychee
27+
uses: lycheeverse/lychee-action@v2
28+
with:
29+
args: >
30+
--base-url "."
31+
--cache --max-cache-age 1d
32+
--max-concurrency 6
33+
--max-retries 6
34+
--retry-wait-time 2
35+
--timeout 30
36+
--github-token ${{ secrets.GITHUB_TOKEN }}
37+
--exclude '^https://github\.com/kedacore/http-add-on/pkgs/container/http-add-on-interceptor$'
38+
--exclude '^https://github\.com/kedacore/http-add-on/pkgs/container/http-add-on-operator$'
39+
--exclude '^https://github\.com/kedacore/http-add-on/pkgs/container/http-add-on-scaler$'
40+
--exclude '^http://opentelemetry-collector\.open-telemetry-system:4318$'
41+
--exclude '^http://opentelemetry-collector\.open-telemetry-system:4318/$'
42+
--exclude '^http://opentelemetry-collector\.open-telemetry-system:4317$'
43+
--exclude '^http://opentelemetry-collector\.open-telemetry-system:4317/$'
44+
--exclude '^http://opentelemetry-collector\.open-telemetry-system:4318/v1/traces$'
45+
--exclude '^https://www\.gnu\.org/software/make/$'
46+
"./**/*.md"

‎.github/workflows/tests.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
validate:
1717
name: validate - ${{ matrix.name }}
1818
runs-on: ${{ matrix.runner }}
19-
container: ghcr.io/kedacore/keda-tools:1.24.3
19+
container: ghcr.io/kedacore/keda-tools:1.24.7
2020
strategy:
2121
matrix:
2222
include:
@@ -40,13 +40,13 @@ jobs:
4040
echo ::set-output name=build_cache::$(go env GOCACHE)
4141
4242
- name: Go modules cache
43-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
43+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
4444
with:
4545
path: ${{ steps.go-paths.outputs.mod_cache }}
4646
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
4747

4848
- name: Go build cache
49-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
49+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
5050
with:
5151
path: ${{ steps.go-paths.outputs.build_cache }}
5252
key: ${{ runner.os }}-go-build-cache-${{ hashFiles('**/go.sum') }}
@@ -77,9 +77,9 @@ jobs:
7777
runs-on: ubuntu-latest
7878
steps:
7979
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
80-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
80+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
8181
with:
82-
go-version: "1.24"
82+
go-version: "1.24.7"
8383
- uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
8484
with:
8585
version: v2.1.0

‎docs/install.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ helm upgrade kedahttp ./charts/keda-add-ons-http \
7575

7676
| HTTP Add-On version | KEDA version | Kubernetes version |
7777
|---------------------|-------------------|--------------------|
78-
| main | v2.16 | v1.30 - v1.32 |
79-
| 0.10.0 | v2.16 | v1.30 - v1.32 |
78+
| main | v2.17 | v1.31 - v1.33 |
79+
| 0.11.0 | v2.17 | v1.31 - v1.33 |
80+
| 0.10.0 | v2.16 | v1.20 - v1.32 |
8081
| 0.9.0 | v2.16 | v1.29 - v1.31 |
8182
| 0.8.0 | v2.14 | v1.27 - v1.29 |
8283
| 0.7.0 | v2.13 | v1.27 - v1.29 |

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kedacore/http-add-on
22

3-
go 1.24.3
3+
go 1.24.7
44

55
require (
66
github.com/go-logr/logr v1.4.3

0 commit comments

Comments
 (0)