Skip to content

Commit 35181ac

Browse files
joelsmithjoelsmith
authored
Merge pull request #239 from jkyros/release-2.14.1
Prepare release 2.14.1
2 parents 0378497 + c70fedc commit 35181ac

26 files changed

+16882
-3917
lines changed

‎.github/workflows/main-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
packages: write
1414
id-token: write # needed for signing the images with GitHub OIDC Token **not production ready**
1515

16-
container: ghcr.io/kedacore/keda-tools:1.22.2
16+
container: ghcr.io/kedacore/keda-tools:1.21.12
1717
steps:
1818
- name: Check out code
1919
uses: actions/checkout@v4

‎.github/workflows/pr-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
contents: read
4545
packages: write
4646

47-
container: ghcr.io/kedacore/keda-tools:1.22.2
47+
container: ghcr.io/kedacore/keda-tools:1.21.12
4848
steps:
4949
- name: Check out code
5050
uses: actions/checkout@v4

‎.github/workflows/release-build.yml

+1-1
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.22.2
15+
container: ghcr.io/kedacore/keda-tools:1.21.12
1616
steps:
1717
- name: Check out code
1818
uses: actions/checkout@v4

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM ghcr.io/kedacore/keda-tools:1.22.2 as builder
2+
FROM ghcr.io/kedacore/keda-tools:1.21.12 as builder
33

44
ARG BUILD_VERSION=main
55
ARG GIT_COMMIT=HEAD

‎Makefile

+9-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,15 @@ else
2626
GOBIN=$(shell go env GOBIN)
2727
endif
2828

29+
# if we're running on a platform where the bundle is going to be deploying into a restricted namespace,
30+
# allow that to be specified so we can supply the proper args
31+
RESTRICTED ?= false
32+
ifeq ($(RESTRICTED),true)
33+
BUNDLE_RUN_OPTS= --security-context-config restricted
34+
endif
35+
2936
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
30-
ENVTEST_K8S_VERSION = 1.29
37+
ENVTEST_K8S_VERSION = 1.29.3
3138

3239
# Setting SHELL to bash allows bash commands to be executed by recipes.
3340
# This is a requirement for 'setup-envtest.sh' in the test target.
@@ -192,7 +199,7 @@ index-push:
192199
.PHONY: deploy-olm ## Deploy bundle. -- build & bundle to update if changes were made to code
193200
deploy-olm: build bundle docker-build docker-push bundle-build bundle-push index-build index-push
194201
kubectl create namespace keda --dry-run=client -o yaml | kubectl apply --server-side -f -
195-
operator-sdk run bundle ${BUNDLE} --namespace keda
202+
operator-sdk run bundle ${BUNDLE} --namespace keda $(BUNDLE_RUN_OPTS)
196203

197204
.PHONY: deploy-olm-testing
198205
deploy-olm-testing:

‎bundle/manifests/keda.clusterserviceversion.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ metadata:
115115
capabilities: Seamless Upgrades
116116
categories: Cloud Provider
117117
certified: "false"
118-
containerImage: ghcr.io/kedacore/keda-olm-operator:2.14.0
119-
createdAt: "2024-06-10T21:28:49Z"
118+
containerImage: ghcr.io/kedacore/keda-olm-operator:2.14.1
119+
createdAt: "2024-08-02T17:41:13Z"
120120
description: Operator that provides KEDA, a Kubernetes-based event driver autoscaler
121121
operatorframework.io/suggested-namespace: keda
122122
operators.operatorframework.io/builder: operator-sdk-v1.31.0
123123
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
124124
repository: https://github.com/kedacore/keda-olm-operator
125125
support: KEDA Community
126-
name: keda.v2.14.0
126+
name: keda.v2.14.1
127127
namespace: placeholder
128128
spec:
129129
apiservicedefinitions: {}
@@ -676,6 +676,6 @@ spec:
676676
minKubeVersion: 1.23.0
677677
provider:
678678
name: KEDA Community
679-
replaces: keda.v2.13.1
679+
replaces: keda.v2.14.0
680680
selector: {}
681-
version: 2.14.0
681+
version: 2.14.1

‎bundle/manifests/keda.sh_kedacontrollers.yaml

+1,561-1,888
Large diffs are not rendered by default.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
controller-gen.kubebuilder.io/version: v0.14.0
77
labels:
88
app.kubernetes.io/part-of: keda-operator
9-
app.kubernetes.io/version: 2.14.0
9+
app.kubernetes.io/version: 2.14.1
1010
name: cloudeventsources.eventing.keda.sh
1111
spec:
1212
group: eventing.keda.sh

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
controller-gen.kubebuilder.io/version: v0.14.0
77
labels:
88
app.kubernetes.io/part-of: keda-operator
9-
app.kubernetes.io/version: 2.14.0
9+
app.kubernetes.io/version: 2.14.1
1010
name: clustertriggerauthentications.keda.sh
1111
spec:
1212
group: keda.sh

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

+1,561-1,888
Large diffs are not rendered by default.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
controller-gen.kubebuilder.io/version: v0.14.0
77
labels:
88
app.kubernetes.io/part-of: keda-operator
9-
app.kubernetes.io/version: 2.14.0
9+
app.kubernetes.io/version: 2.14.1
1010
name: scaledjobs.keda.sh
1111
spec:
1212
group: keda.sh

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
controller-gen.kubebuilder.io/version: v0.14.0
77
labels:
88
app.kubernetes.io/part-of: keda-operator
9-
app.kubernetes.io/version: 2.14.0
9+
app.kubernetes.io/version: 2.14.1
1010
name: scaledobjects.keda.sh
1111
spec:
1212
group: keda.sh

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
controller-gen.kubebuilder.io/version: v0.14.0
77
labels:
88
app.kubernetes.io/part-of: keda-operator
9-
app.kubernetes.io/version: 2.14.0
9+
app.kubernetes.io/version: 2.14.1
1010
name: triggerauthentications.keda.sh
1111
spec:
1212
group: keda.sh

‎config/manifests/bases/keda.clusterserviceversion.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ metadata:
115115
capabilities: Seamless Upgrades
116116
categories: Cloud Provider
117117
certified: "false"
118-
containerImage: ghcr.io/kedacore/keda-olm-operator:2.14.0
118+
containerImage: ghcr.io/kedacore/keda-olm-operator:2.14.1
119119
createdAt: "2023-09-11T23:35:30Z"
120120
description: Operator that provides KEDA, a Kubernetes-based event driver autoscaler
121121
operatorframework.io/suggested-namespace: keda
122122
operators.operatorframework.io/builder: operator-sdk-v1.23.0
123123
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
124124
repository: https://github.com/kedacore/keda-olm-operator
125125
support: KEDA Community
126-
name: keda.v2.14.0
126+
name: keda.v2.14.1
127127
namespace: placeholder
128128
spec:
129129
apiservicedefinitions: {}
@@ -673,6 +673,6 @@ spec:
673673
minKubeVersion: 1.23.0
674674
provider:
675675
name: KEDA Community
676-
replaces: keda.v2.13.1
676+
replaces: keda.v2.14.0
677677
selector: {}
678-
version: 2.14.0
678+
version: 2.14.1

‎go.mod

+31-29
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ require (
99
github.com/manifestival/controller-runtime-client v0.4.0
1010
github.com/manifestival/manifestival v0.7.3-0.20230801201407-f20c69532c27
1111
github.com/onsi/ginkgo v1.16.5
12-
github.com/onsi/gomega v1.33.1
12+
github.com/onsi/gomega v1.34.1
1313
github.com/open-policy-agent/cert-controller v0.10.1
14-
github.com/openshift/api v0.0.0-20240605153344-636e2c17106f
15-
k8s.io/api v0.29.2
16-
k8s.io/apimachinery v0.29.2
17-
k8s.io/apiserver v0.29.2
18-
k8s.io/client-go v0.29.2
19-
k8s.io/kube-aggregator v0.29.2
20-
sigs.k8s.io/controller-runtime v0.16.6
21-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240608161558-1f5b39fa59d1
22-
sigs.k8s.io/controller-tools v0.13.0
23-
sigs.k8s.io/kustomize/kustomize/v5 v5.4.2
14+
github.com/openshift/api v0.0.0-20240702171116-4b89b3a92a17
15+
k8s.io/api v0.29.4
16+
k8s.io/apimachinery v0.29.4
17+
k8s.io/apiserver v0.29.4
18+
k8s.io/client-go v0.29.4
19+
k8s.io/kube-aggregator v0.29.4
20+
sigs.k8s.io/controller-runtime v0.17.3
21+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240201105228-4000e996a202
22+
sigs.k8s.io/controller-tools v0.14.0
23+
sigs.k8s.io/kustomize/kustomize/v5 v5.4.3
2424
sigs.k8s.io/yaml v1.4.0
2525
)
2626

@@ -63,41 +63,43 @@ require (
6363
github.com/pkg/errors v0.9.1 // indirect
6464
github.com/prometheus/client_golang v1.19.1 // indirect
6565
github.com/prometheus/client_model v0.6.1 // indirect
66-
github.com/prometheus/common v0.54.0 // indirect
66+
github.com/prometheus/common v0.55.0 // indirect
6767
github.com/prometheus/procfs v0.15.1 // indirect
68+
github.com/rogpeppe/go-internal v1.12.0 // indirect
69+
github.com/sergi/go-diff v1.3.1 // indirect
6870
github.com/spf13/afero v1.11.0 // indirect
69-
github.com/spf13/cobra v1.8.0 // indirect
71+
github.com/spf13/cobra v1.8.1 // indirect
7072
github.com/spf13/pflag v1.0.5 // indirect
7173
github.com/xlab/treeprint v1.2.0 // indirect
72-
go.starlark.net v0.0.0-20240123142251-f86470692795 // indirect
74+
go.starlark.net v0.0.0-20240725214946-42030a7cedce // indirect
7375
go.uber.org/atomic v1.11.0 // indirect
7476
go.uber.org/multierr v1.11.0 // indirect
7577
go.uber.org/zap v1.27.0 // indirect
76-
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
77-
golang.org/x/mod v0.18.0 // indirect
78-
golang.org/x/net v0.26.0 // indirect
78+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
79+
golang.org/x/mod v0.19.0 // indirect
80+
golang.org/x/net v0.27.0 // indirect
7981
golang.org/x/oauth2 v0.21.0 // indirect
8082
golang.org/x/sync v0.7.0 // indirect
81-
golang.org/x/sys v0.21.0 // indirect
82-
golang.org/x/term v0.21.0 // indirect
83+
golang.org/x/sys v0.22.0 // indirect
84+
golang.org/x/term v0.22.0 // indirect
8385
golang.org/x/text v0.16.0 // indirect
8486
golang.org/x/time v0.5.0 // indirect
85-
golang.org/x/tools v0.22.0 // indirect
87+
golang.org/x/tools v0.23.0 // indirect
8688
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
87-
google.golang.org/protobuf v1.34.1 // indirect
89+
google.golang.org/protobuf v1.34.2 // indirect
8890
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8991
gopkg.in/inf.v0 v0.9.1 // indirect
9092
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9193
gopkg.in/yaml.v2 v2.4.0 // indirect
9294
gopkg.in/yaml.v3 v3.0.1 // indirect
93-
k8s.io/apiextensions-apiserver v0.29.2 // indirect
94-
k8s.io/component-base v0.29.2 // indirect
95-
k8s.io/klog/v2 v2.120.1 // indirect
96-
k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232 // indirect
97-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
95+
k8s.io/apiextensions-apiserver v0.29.4 // indirect
96+
k8s.io/component-base v0.29.4 // indirect
97+
k8s.io/klog/v2 v2.130.1 // indirect
98+
k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e // indirect
99+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
98100
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
99-
sigs.k8s.io/kustomize/api v0.17.2 // indirect
100-
sigs.k8s.io/kustomize/cmd/config v0.14.1 // indirect
101-
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
101+
sigs.k8s.io/kustomize/api v0.17.3 // indirect
102+
sigs.k8s.io/kustomize/cmd/config v0.14.2 // indirect
103+
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
102104
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
103105
)

0 commit comments

Comments
 (0)