Skip to content

Commit b1421f3

Browse files
nrichardson-akasanrichardson-akasa
authored
Merge branch 'main' into aws-secretsmanager-additions
2 parents b9951d1 + 800a541 commit b1421f3

File tree

1,441 files changed

+53942
-28973
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,441 files changed

+53942
-28973
lines changed

‎.github/workflows/pr-e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ jobs:
254254
details_url: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
255255

256256
- name: Upload test logs
257-
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
257+
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4
258258
with:
259259
name: e2e-test-logs
260260
path: "${{ github.workspace }}/**/*.log"

‎.github/workflows/template-main-e2e-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
NODE_POOL_SIZE: 1
4848

4949
- name: Upload test logs
50-
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
50+
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4
5151
if: ${{ always() }}
5252
with:
5353
name: e2e-test-logs

‎.github/workflows/template-smoke-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
run: make smoke-test
4545

4646
- name: Upload test logs
47-
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
47+
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4
4848
if: ${{ always() }}
4949
with:
5050
name: smoke-test-logs ${{ inputs.runs-on }}-${{ inputs.kubernetesVersion }}

‎.golangci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ run:
77
- e2e
88
# timeout for analysis, e.g. 30s, 5m, default is 1m
99
timeout: 10m
10-
# skip vendor directory
11-
skip-dirs:
12-
- vendor
1310
modules-download-mode: vendor
1411
linters:
1512
# please, do not use `enable-all`: it's deprecated and will be removed soon.
@@ -49,6 +46,9 @@ linters:
4946
issues:
5047
include:
5148
- EXC0002 # disable excluding of issues about comments from golint
49+
exclude-dirs:
50+
# skip vendor directory
51+
- vendor
5252
# Excluding configuration per-path, per-linter, per-text and per-source
5353
exclude-rules:
5454
- path: _test\.go

‎CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Here is an overview of all new **experimental** features:
7171

7272
### Fixes
7373

74-
- TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
74+
- **General**: Hashicorp Vault PKI doesn't fail with due to KeyPair mismatch ([#6028](https://github.com/kedacore/keda/issues/6028))
7575

7676
### Deprecations
7777

@@ -87,7 +87,7 @@ New deprecation(s):
8787

8888
### Other
8989

90-
- TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
90+
- **General**: Bump deps and k8s deps to 0.29.7 ([#6035](https://github.com/kedacore/keda/pull/6035))
9191

9292
## v2.15.0
9393

‎config/crd/bases/eventing.keda.sh_cloudeventsources.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: cloudeventsources.eventing.keda.sh
88
spec:
99
group: eventing.keda.sh

‎config/crd/bases/keda.sh_clustertriggerauthentications.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: clustertriggerauthentications.keda.sh
88
spec:
99
group: keda.sh

‎config/crd/bases/keda.sh_scaledjobs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: scaledjobs.keda.sh
88
spec:
99
group: keda.sh

‎config/crd/bases/keda.sh_scaledobjects.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: scaledobjects.keda.sh
88
spec:
99
group: keda.sh

‎config/crd/bases/keda.sh_triggerauthentications.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: triggerauthentications.keda.sh
88
spec:
99
group: keda.sh

0 commit comments

Comments
 (0)