Prepare release 2.14.1

- This also adds a RESTRICTED variable to the Makefile and relprep instructions to allow for more successful testing against clusters with restricted namespaces - The envtest 1.29.4 assets are problematic and panic the functionality tests, but the 1.29.3 assets work properly. I don't know root cause, I just know that 1.29.4 doesn't work. Signed-off-by: John Kyros <[email protected]>
kedacore · Aug 2, 2024 · c70fedc · c70fedc
1 parent 0378497
commit c70fedc
Show file tree

Hide file tree

Showing 26 changed files with 16,882 additions and 3,917 deletions.
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
@@ -13,7 +13,7 @@ jobs:
       packages: write
       id-token: write # needed for signing the images with GitHub OIDC Token **not production ready**
 
-    container: ghcr.io/kedacore/keda-tools:1.22.2
+    container: ghcr.io/kedacore/keda-tools:1.21.12
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml
@@ -44,7 +44,7 @@ jobs:
       contents: read
       packages: write
 
-    container: ghcr.io/kedacore/keda-tools:1.22.2
+    container: ghcr.io/kedacore/keda-tools:1.21.12
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -12,7 +12,7 @@ jobs:
       packages: write
       id-token: write # needed for signing the images with GitHub OIDC Token **not production ready**
 
-    container: ghcr.io/kedacore/keda-tools:1.22.2
+    container: ghcr.io/kedacore/keda-tools:1.21.12
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM ghcr.io/kedacore/keda-tools:1.22.2 as builder
+FROM ghcr.io/kedacore/keda-tools:1.21.12 as builder
 
 ARG BUILD_VERSION=main
 ARG GIT_COMMIT=HEAD

diff --git a/Makefile b/Makefile
@@ -26,8 +26,15 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
+# if we're running on a platform where the bundle is going to be deploying into a restricted namespace,
+# allow that to be specified so we can supply the proper args
+RESTRICTED ?= false
+ifeq ($(RESTRICTED),true)
+BUNDLE_RUN_OPTS= --security-context-config restricted
+endif
+
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.29
+ENVTEST_K8S_VERSION = 1.29.3
 
 # Setting SHELL to bash allows bash commands to be executed by recipes.
 # This is a requirement for 'setup-envtest.sh' in the test target.
@@ -192,7 +199,7 @@ index-push:
 .PHONY: deploy-olm	## Deploy bundle. -- build & bundle to update if changes were made to code
 deploy-olm: build bundle docker-build docker-push bundle-build bundle-push index-build index-push
 	kubectl create namespace keda --dry-run=client -o yaml | kubectl apply --server-side -f -
-	operator-sdk run bundle ${BUNDLE} --namespace keda
+	operator-sdk run bundle ${BUNDLE} --namespace keda $(BUNDLE_RUN_OPTS)
 
 .PHONY: deploy-olm-testing
 deploy-olm-testing:

diff --git a/bundle/manifests/keda.clusterserviceversion.yaml b/bundle/manifests/keda.clusterserviceversion.yaml
@@ -115,15 +115,15 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Cloud Provider
     certified: "false"
-    containerImage: ghcr.io/kedacore/keda-olm-operator:2.14.0
-    createdAt: "2024-06-10T21:28:49Z"
+    containerImage: ghcr.io/kedacore/keda-olm-operator:2.14.1
+    createdAt: "2024-08-02T17:41:13Z"
     description: Operator that provides KEDA, a Kubernetes-based event driver autoscaler
     operatorframework.io/suggested-namespace: keda
     operators.operatorframework.io/builder: operator-sdk-v1.31.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/kedacore/keda-olm-operator
     support: KEDA Community
-  name: keda.v2.14.0
+  name: keda.v2.14.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -676,6 +676,6 @@ spec:
   minKubeVersion: 1.23.0
   provider:
     name: KEDA Community
-  replaces: keda.v2.13.1
+  replaces: keda.v2.14.0
   selector: {}
-  version: 2.14.0
+  version: 2.14.1
diff --git a/bundle/manifests/keda.sh_kedacontrollers.yaml b/bundle/manifests/keda.sh_kedacontrollers.yaml
diff --git a/config/crd/bases/eventing.keda.sh_cloudeventsources.yaml b/config/crd/bases/eventing.keda.sh_cloudeventsources.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app.kubernetes.io/part-of: keda-operator
-    app.kubernetes.io/version: 2.14.0
+    app.kubernetes.io/version: 2.14.1
   name: cloudeventsources.eventing.keda.sh
 spec:
   group: eventing.keda.sh

diff --git a/config/crd/bases/keda.sh_clustertriggerauthentications.yaml b/config/crd/bases/keda.sh_clustertriggerauthentications.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app.kubernetes.io/part-of: keda-operator
-    app.kubernetes.io/version: 2.14.0
+    app.kubernetes.io/version: 2.14.1
   name: clustertriggerauthentications.keda.sh
 spec:
   group: keda.sh

diff --git a/config/crd/bases/keda.sh_kedacontrollers.yaml b/config/crd/bases/keda.sh_kedacontrollers.yaml
diff --git a/config/crd/bases/keda.sh_scaledjobs.yaml b/config/crd/bases/keda.sh_scaledjobs.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app.kubernetes.io/part-of: keda-operator
-    app.kubernetes.io/version: 2.14.0
+    app.kubernetes.io/version: 2.14.1
   name: scaledjobs.keda.sh
 spec:
   group: keda.sh

diff --git a/config/crd/bases/keda.sh_scaledobjects.yaml b/config/crd/bases/keda.sh_scaledobjects.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app.kubernetes.io/part-of: keda-operator
-    app.kubernetes.io/version: 2.14.0
+    app.kubernetes.io/version: 2.14.1
   name: scaledobjects.keda.sh
 spec:
   group: keda.sh

diff --git a/config/crd/bases/keda.sh_triggerauthentications.yaml b/config/crd/bases/keda.sh_triggerauthentications.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app.kubernetes.io/part-of: keda-operator
-    app.kubernetes.io/version: 2.14.0
+    app.kubernetes.io/version: 2.14.1
   name: triggerauthentications.keda.sh
 spec:
   group: keda.sh

diff --git a/config/manifests/bases/keda.clusterserviceversion.yaml b/config/manifests/bases/keda.clusterserviceversion.yaml
@@ -115,15 +115,15 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Cloud Provider
     certified: "false"
-    containerImage: ghcr.io/kedacore/keda-olm-operator:2.14.0
+    containerImage: ghcr.io/kedacore/keda-olm-operator:2.14.1
     createdAt: "2023-09-11T23:35:30Z"
     description: Operator that provides KEDA, a Kubernetes-based event driver autoscaler
     operatorframework.io/suggested-namespace: keda
     operators.operatorframework.io/builder: operator-sdk-v1.23.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/kedacore/keda-olm-operator
     support: KEDA Community
-  name: keda.v2.14.0
+  name: keda.v2.14.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -673,6 +673,6 @@ spec:
   minKubeVersion: 1.23.0
   provider:
     name: KEDA Community
-  replaces: keda.v2.13.1
+  replaces: keda.v2.14.0
   selector: {}
-  version: 2.14.0
+  version: 2.14.1
diff --git a/go.mod b/go.mod
@@ -9,18 +9,18 @@ require (
 	github.com/manifestival/controller-runtime-client v0.4.0
 	github.com/manifestival/manifestival v0.7.3-0.20230801201407-f20c69532c27
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.33.1
+	github.com/onsi/gomega v1.34.1
 	github.com/open-policy-agent/cert-controller v0.10.1
-	github.com/openshift/api v0.0.0-20240605153344-636e2c17106f
-	k8s.io/api v0.29.2
-	k8s.io/apimachinery v0.29.2
-	k8s.io/apiserver v0.29.2
-	k8s.io/client-go v0.29.2
-	k8s.io/kube-aggregator v0.29.2
-	sigs.k8s.io/controller-runtime v0.16.6
-	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240608161558-1f5b39fa59d1
-	sigs.k8s.io/controller-tools v0.13.0
-	sigs.k8s.io/kustomize/kustomize/v5 v5.4.2
+	github.com/openshift/api v0.0.0-20240702171116-4b89b3a92a17
+	k8s.io/api v0.29.4
+	k8s.io/apimachinery v0.29.4
+	k8s.io/apiserver v0.29.4
+	k8s.io/client-go v0.29.4
+	k8s.io/kube-aggregator v0.29.4
+	sigs.k8s.io/controller-runtime v0.17.3
+	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240201105228-4000e996a202
+	sigs.k8s.io/controller-tools v0.14.0
+	sigs.k8s.io/kustomize/kustomize/v5 v5.4.3
 	sigs.k8s.io/yaml v1.4.0
 )
 
@@ -63,41 +63,43 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.19.1 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.54.0 // indirect
+	github.com/prometheus/common v0.55.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cobra v1.8.0 // indirect
+	github.com/spf13/cobra v1.8.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
-	go.starlark.net v0.0.0-20240123142251-f86470692795 // indirect
+	go.starlark.net v0.0.0-20240725214946-42030a7cedce // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
-	golang.org/x/mod v0.18.0 // indirect
-	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
+	golang.org/x/mod v0.19.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/term v0.22.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.22.0 // indirect
+	golang.org/x/tools v0.23.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.29.2 // indirect
-	k8s.io/component-base v0.29.2 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232 // indirect
-	k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
+	k8s.io/apiextensions-apiserver v0.29.4 // indirect
+	k8s.io/component-base v0.29.4 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e // indirect
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kustomize/api v0.17.2 // indirect
-	sigs.k8s.io/kustomize/cmd/config v0.14.1 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
+	sigs.k8s.io/kustomize/api v0.17.3 // indirect
+	sigs.k8s.io/kustomize/cmd/config v0.14.2 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )