Merge pull request #210 from joelsmith/kedamain

Release 2.12.0
kedacore · Nov 3, 2023 · 1ffa444 · 1ffa444
2 parents 6b5c3f3 + 0d8b75e
commit 1ffa444
Show file tree

Hide file tree

Showing 26 changed files with 14,045 additions and 376 deletions.
diff --git a/Makefile b/Makefile
@@ -143,7 +143,8 @@ golangci:	## Run golangci against code.
 BUNDLE = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/keda-olm-operator-bundle:$(VERSION)
 INDEX = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/keda-olm-operator-index:$(VERSION)
 # Options for 'bundle-build'
-DEFAULT_CHANNEL=alpha
+DEFAULT_CHANNEL?=stable
+CHANNELS?=stable
 
 ifneq ($(origin CHANNELS), undefined)
 BUNDLE_CHANNELS := --channels=$(CHANNELS)

diff --git a/RELEASE-PROCESS.md b/RELEASE-PROCESS.md
@@ -52,7 +52,7 @@ mv keda/2.9.0/manifests/keda.v2.8.0.clusterserviceversion.yaml keda/2.9.0/manife
 ```
 operator-sdk bundle validate ./keda/2.9.0
 ```
-- test that the bundle is deployable and functional on OpenShift instance.
+- test that the bundle is deployable and functional on OpenShift instance and on a vanilla K8s cluster with OLM installed.
 
 ## 7. Commit and push the changed code to GitHub
 ```bash

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=keda
-LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
+LABEL operators.operatorframework.io.bundle.channels.v1=stable
+LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

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.11.2
-    createdAt: "2023-09-11T20:30:37Z"
+    containerImage: ghcr.io/kedacore/keda-olm-operator:2.12.0
+    createdAt: "2023-10-23T21:58:44Z"
     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.11.2
+  name: keda.v2.12.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -662,10 +662,10 @@ spec:
   maintainers:
   - email: cncf-keda-maintainers@lists.cncf.io
     name: KEDA Community
-  maturity: alpha
+  maturity: stable
   minKubeVersion: 1.23.0
   provider:
     name: KEDA Community
-  replaces: keda.v2.10.1
+  replaces: keda.v2.11.2
   selector: {}
-  version: 2.11.2
+  version: 2.12.0
diff --git a/bundle/manifests/keda.sh_clustertriggerauthentications.yaml b/bundle/manifests/keda.sh_clustertriggerauthentications.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   creationTimestamp: null
   labels:
     app.kubernetes.io/part-of: keda-olm-operator
@@ -33,6 +33,14 @@ spec:
     - jsonPath: .spec.hashiCorpVault.address
       name: VaultAddress
       type: string
+    - jsonPath: .status.scaledobjects
+      name: ScaledObjects
+      priority: 1
+      type: string
+    - jsonPath: .status.scaledjobs
+      name: ScaledJobs
+      priority: 1
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:
@@ -225,12 +233,22 @@ spec:
                   type: object
                 type: array
             type: object
+          status:
+            description: TriggerAuthenticationStatus defines the observed state of
+              TriggerAuthentication
+            properties:
+              scaledjobs:
+                type: string
+              scaledobjects:
+                type: string
+            type: object
         required:
         - spec
         type: object
     served: true
     storage: true
-    subresources: {}
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""

diff --git a/bundle/manifests/keda.sh_kedacontrollers.yaml b/bundle/manifests/keda.sh_kedacontrollers.yaml
@@ -3272,3 +3272,9 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: null
+  storedVersions: null
diff --git a/bundle/manifests/keda.sh_scaledjobs.yaml b/bundle/manifests/keda.sh_scaledjobs.yaml
diff --git a/bundle/manifests/keda.sh_scaledobjects.yaml b/bundle/manifests/keda.sh_scaledobjects.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   creationTimestamp: null
   labels:
     app.kubernetes.io/part-of: keda-olm-operator
@@ -141,6 +141,8 @@ spec:
                                   - For scale down: 300 (i.e. the stabilization window
                                   is 300 seconds long).'
                                 format: int32
+                                maximum: 3600
+                                minimum: 0
                                 type: integer
                             type: object
                           scaleUp:
@@ -198,6 +200,8 @@ spec:
                                   - For scale down: 300 (i.e. the stabilization window
                                   is 300 seconds long).'
                                 format: int32
+                                maximum: 3600
+                                minimum: 0
                                 type: integer
                             type: object
                         type: object
@@ -206,6 +210,22 @@ spec:
                     type: object
                   restoreToOriginalReplicaCount:
                     type: boolean
+                  scalingModifiers:
+                    description: ScalingModifiers describes advanced scaling logic
+                      options like formula
+                    properties:
+                      activationTarget:
+                        type: string
+                      formula:
+                        type: string
+                      metricType:
+                        description: MetricTargetType specifies the type of metric
+                          being targeted, and should be either "Value", "AverageValue",
+                          or "Utilization"
+                        type: string
+                      target:
+                        type: string
+                    type: object
                 type: object
               cooldownPeriod:
                 format: int32
@@ -236,8 +256,7 @@ spec:
                 format: int32
                 type: integer
               scaleTargetRef:
-                description: ScaleTarget holds the a reference to the scale target
-                  Object
+                description: ScaleTarget holds the reference to the scale target Object
                 properties:
                   apiVersion:
                     type: string
@@ -295,6 +314,8 @@ spec:
           status:
             description: ScaledObjectStatus is the status for a ScaledObject resource
             properties:
+              compositeScalerName:
+                type: string
               conditions:
                 description: Conditions an array representation to store multiple
                   Conditions

diff --git a/bundle/manifests/keda.sh_triggerauthentications.yaml b/bundle/manifests/keda.sh_triggerauthentications.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   creationTimestamp: null
   labels:
     app.kubernetes.io/part-of: keda-olm-operator
@@ -33,6 +33,14 @@ spec:
     - jsonPath: .spec.hashiCorpVault.address
       name: VaultAddress
       type: string
+    - jsonPath: .status.scaledobjects
+      name: ScaledObjects
+      priority: 1
+      type: string
+    - jsonPath: .status.scaledjobs
+      name: ScaledJobs
+      priority: 1
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:
@@ -224,12 +232,22 @@ spec:
                   type: object
                 type: array
             type: object
+          status:
+            description: TriggerAuthenticationStatus defines the observed state of
+              TriggerAuthentication
+            properties:
+              scaledjobs:
+                type: string
+              scaledobjects:
+                type: string
+            type: object
         required:
         - spec
         type: object
     served: true
     storage: true
-    subresources: {}
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -4,8 +4,8 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: keda
-  operators.operatorframework.io.bundle.channels.v1: alpha
-  operators.operatorframework.io.bundle.channel.default.v1: alpha
+  operators.operatorframework.io.bundle.channels.v1: stable
+  operators.operatorframework.io.bundle.channel.default.v1: stable
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

diff --git a/config/crd/bases/keda.sh_clustertriggerauthentications.yaml b/config/crd/bases/keda.sh_clustertriggerauthentications.yaml
@@ -3,10 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/part-of: keda-operator
-    app.kubernetes.io/version: 2.11.2
+    app.kubernetes.io/version: 2.12.0
   name: clustertriggerauthentications.keda.sh
 spec:
   group: keda.sh
@@ -33,6 +33,14 @@ spec:
     - jsonPath: .spec.hashiCorpVault.address
       name: VaultAddress
       type: string
+    - jsonPath: .status.scaledobjects
+      name: ScaledObjects
+      priority: 1
+      type: string
+    - jsonPath: .status.scaledjobs
+      name: ScaledJobs
+      priority: 1
+      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:
@@ -225,9 +233,19 @@ spec:
                   type: object
                 type: array
             type: object
+          status:
+            description: TriggerAuthenticationStatus defines the observed state of
+              TriggerAuthentication
+            properties:
+              scaledjobs:
+                type: string
+              scaledobjects:
+                type: string
+            type: object
         required:
         - spec
         type: object
     served: true
     storage: true
-    subresources: {}
+    subresources:
+      status: {}