Merge branch 'main' into etamar/rollout-strategy

.devcontainer/Dockerfile

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM golang:1.16.7
+FROM golang:1.16.9
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive

.github/stale.yml

@@ -0,0 +1,43 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - cant-touch-this
+  - feature
+  - security
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed in 7 days if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+closeComment: >
+  This issue has been automatically closed due to inactivity.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+only: issues

CHANGELOG.md

@@ -35,11 +35,18 @@
 - Escape `queueName` and `vhostName` in RabbitMQ Scaler before use them in query string (bug fix) ([#2055](https://github.com/kedacore/keda/pull/2055))
 - TriggerAuthentication/Vault: add support for HashiCorp Vault namespace (Vault Enterprise) ([#2085](https://github.com/kedacore/keda/pull/2085))
 - Add custom http timeout in RabbitMQ Scaler ([#2086](https://github.com/kedacore/keda/pull/2086))
+- Artemis Scaler parses out broker config parameters in case `restAPITemplate` is given ([#2104](https://github.com/kedacore/keda/pull/2104))
 - Add support to get connection data from Trigger Authorization in MongoDB Scaler ([#2115](https://github.com/kedacore/keda/pull/2115))
 - Add support to get connection data from Trigger Authorization in MySQL Scaler ([#2113](https://github.com/kedacore/keda/pull/2113))
 - Add support to get connection data from Trigger Authorization in MSSQL Scaler ([#2112](https://github.com/kedacore/keda/pull/2112))
 - Add support to get connection data from Trigger Authorization in PostgreSQL Scaler ([#2114](https://github.com/kedacore/keda/pull/2114))
 - Add support to provide the metric name in Azure Log Analytics Scaler ([#2106](https://github.com/kedacore/keda/pull/2106))
+- MySQL Scaler: don't expose connection string in `metricName` ([#2171](https://github.com/kedacore/keda/pull/2171))
+- Provide support for configuring authentication through TriggerAuthentication for Stan scaler ([#2167](https://github.com/kedacore/keda/pull/2167))
+- Add `pageSize` (using regex) in RabbitMQ Scaler ([#2162](https://github.com/kedacore/keda/pull/2162))
+- Add `unsafeSsl` parameter in InfluxDB scaler ([#2157](https://github.com/kedacore/keda/pull/2157))
+- Improve metric name creation to be unique using scaler index inside the scaler ([#2161](https://github.com/kedacore/keda/pull/2161))
+- Improve error message if `IdleReplicaCount` are equal to `MinReplicaCount` to be the same as the check ([#2212](https://github.com/kedacore/keda/pull/2212))
 
 ### Breaking Changes
 
@@ -50,8 +57,10 @@
 - Migrate to Kubebuilder v3 ([#2082](https://github.com/kedacore/keda/pull/2082))
     - API path has been changed: `github.com/kedacore/keda/v2/api/v1alpha1` -> `github.com/kedacore/keda/v2/apis/keda/v1alpha1`
 - Use Patch to set FallbackCondition on ScaledObject.Status ([#2037](https://github.com/kedacore/keda/pull/2037))
-- Bump Golang to 1.16.7 ([#2065](https://github.com/kedacore/keda/pull/2065))
+- Bump Golang to 1.16.9 ([#2065](https://github.com/kedacore/keda/pull/2065)|[#2186](https://github.com/kedacore/keda/pull/2186))
 - Add Makefile mockgen targets ([#2090](https://github.com/kedacore/keda/issues/2090))
+- Prometheus scaler: omit `serverAddress` from generated metric name ([#2099](https://github.com/kedacore/keda/pull/2099))
+- Add Makefile mockgen targets ([#2090](https://github.com/kedacore/keda/issues/2090)|[#2184](https://github.com/kedacore/keda/pull/2184))
 
 ## v2.4.0
 

CREATE-NEW-SCALER.md

@@ -44,6 +44,31 @@ The return type of this function is `MetricSpec`, but in KEDA's case we will mos
 - `TargetValue`: is the value of the metric we want to reach at all times at all costs. As long as the current metric doesn't match TargetValue, HPA will increase the number of the pods until it reaches the maximum number of pods allowed to scale to.
 - `TargetAverageValue`: the value of the metric for which we require one pod to handle. e.g. if we are have a scaler based on the length of a message queue, and we specificy 10 for `TargetAverageValue`, we are saying that each pod will handle 10 messages. So if the length of the queue becomes 30, we expect that we have 3 pods in our cluster. (`TargetAverage` and `TargetValue` are mutually exclusive)
 
+All scalers receive a parameter named `scalerIndex` as part of `ScalerConfig`. This value is the index of the current scaler in a ScaledObject. All metric names have to start with `sX-` (where `X` is `scalerIndex`). This convention makes the metric name unique in the ScaledObject and brings the option to have more than 1 "similar metric name" defined in a ScaledObject.
+
+For example:
+- s0-redis-mylist
+- s1-redis-mylist
+
+>**Note:** There is a naming helper function `GenerateMetricNameWithIndex(scalerIndex int, metricName string)`, that receives the current index and the original metric name (without the prefix) and returns the concatenated string using the convention (please use this function).<br>Next lines are an example about how to use it:
+>```golang
+>func (s *artemisScaler) GetMetricSpecForScaling() []v2beta2.MetricSpec {
+>	targetMetricValue := resource.NewQuantity(int64(s.metadata.queueLength), resource.DecimalSI)
+>	externalMetric := &v2beta2.ExternalMetricSource{
+>		Metric: v2beta2.MetricIdentifier{
+>			Name: GenerateMetricNameWithIndex(s.metadata.scalerIndex, kedautil.NormalizeString(fmt.Sprintf("%s-%s-%s", "artemis", s.metadata.brokerName, s.metadata.queueName))),
+>		},
+>		Target: v2beta2.MetricTarget{
+>			Type:         v2beta2.AverageValueMetricType,
+>			AverageValue: targetMetricValue,
+>		},
+>	}
+>	metricSpec := v2beta2.MetricSpec{External: externalMetric, Type: artemisMetricType}
+>	return []v2beta2.MetricSpec{metricSpec}
+>}
+>```
+
+
 ### IsActive
 
 For some reason, the scaler might need to declare itself as in-active, and the way it can do this is through implementing the function `IsActive`.

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.16.7 as builder
+FROM golang:1.16.9 as builder
 
 ARG BUILD_VERSION=main
 ARG GIT_COMMIT=HEAD

Dockerfile.adapter

@@ -1,5 +1,5 @@
 # Build the adapter binary
-FROM golang:1.16.7 as builder
+FROM golang:1.16.9 as builder
 
 ARG BUILD_VERSION=main
 ARG GIT_COMMIT=HEAD

Makefile

@@ -121,7 +121,7 @@ clientset-generate: ## Generate client-go clientset, listers and informers.
 
 # Generate Liiklus proto
 pkg/scalers/liiklus/LiiklusService.pb.go: hack/LiiklusService.proto
-	protoc -I hack/ hack/LiiklusService.proto --go_out=plugins=grpc:pkg/scalers/liiklus
+	protoc -I hack/ hack/LiiklusService.proto --go_out=pkg/scalers/liiklus --go-grpc_out=pkg/scalers/liiklus
 
 .PHONY: mockgen-gen
 mockgen-gen: mockgen pkg/mock/mock_scaling/mock_interface.go pkg/mock/mock_scaler/mock_scaler.go pkg/mock/mock_scale/mock_interfaces.go pkg/mock/mock_client/mock_interfaces.go pkg/scalers/liiklus/mocks/mock_liiklus.go

RELEASE-PROCESS.MD

@@ -80,3 +80,7 @@ https://github.com/Azure/azure-functions-core-tools/blob/v3.x/src/Azure.Function
 ## 6. Create Helm release on GitHub
 
 Create Helm release on GitHub with changelog of what changed to our Helm chart.
+
+## 7. Prepare next release
+
+Prepare next release by creating a [new GitHub milestone](https://github.com/kedacore/keda/milestones/new) called `v{upcoming-semver-version}` with a target date in 3 months as per our [release governance](https://github.com/kedacore/governance/blob/main/RELEASES.md).

controllers/keda/scaledobject_controller.go

@@ -342,7 +342,7 @@ func (r *ScaledObjectReconciler) checkReplicaCountBoundsAreValid(scaledObject *k
 	}
 
 	if scaledObject.Spec.IdleReplicaCount != nil && *scaledObject.Spec.IdleReplicaCount >= min {
-		return fmt.Errorf("IdleReplicaCount=%d must be less or equal to MinReplicaCount=%d", *scaledObject.Spec.IdleReplicaCount, min)
+		return fmt.Errorf("IdleReplicaCount=%d must be less than MinReplicaCount=%d", *scaledObject.Spec.IdleReplicaCount, min)
 	}
 
 	return nil

controllers/keda/scaledobject_controller_test.go

@@ -245,8 +245,8 @@ var _ = Describe("ScaledObjectController", func() {
 				return k8sClient.Get(context.Background(), types.NamespacedName{Name: "keda-hpa-clean-up-test", Namespace: "default"}, hpa)
 			}).ShouldNot(HaveOccurred())
 			Expect(hpa.Spec.Metrics).To(HaveLen(2))
-			Expect(hpa.Spec.Metrics[0].External.Metric.Name).To(Equal("cron-UTC-0xxxx-1xxxx"))
-			Expect(hpa.Spec.Metrics[1].External.Metric.Name).To(Equal("cron-UTC-2xxxx-3xxxx"))
+			Expect(hpa.Spec.Metrics[0].External.Metric.Name).To(Equal("s0-cron-UTC-0xxxx-1xxxx"))
+			Expect(hpa.Spec.Metrics[1].External.Metric.Name).To(Equal("s1-cron-UTC-2xxxx-3xxxx"))
 
 			// Remove the second trigger.
 			Eventually(func() error {
@@ -263,7 +263,7 @@ var _ = Describe("ScaledObjectController", func() {
 				return len(hpa.Spec.Metrics)
 			}).Should(Equal(1))
 			// And it should only be the first one left.
-			Expect(hpa.Spec.Metrics[0].External.Metric.Name).To(Equal("cron-UTC-0xxxx-1xxxx"))
+			Expect(hpa.Spec.Metrics[0].External.Metric.Name).To(Equal("s0-cron-UTC-0xxxx-1xxxx"))
 		})
 
 		It("deploys ScaledObject and creates HPA, when IdleReplicaCount, MinReplicaCount and MaxReplicaCount is defined", func() {

go.mod

@@ -3,19 +3,19 @@ module github.com/kedacore/keda/v2
 go 1.16
 
 require (
-	cloud.google.com/go/monitoring v0.1.0
-	github.com/Azure/azure-amqp-common-go/v3 v3.1.1
-	github.com/Azure/azure-event-hubs-go/v3 v3.3.13
-	github.com/Azure/azure-sdk-for-go v57.0.0+incompatible
-	github.com/Azure/azure-service-bus-go v0.10.16
+	cloud.google.com/go/monitoring v1.0.0
+	github.com/Azure/azure-amqp-common-go/v3 v3.2.1
+	github.com/Azure/azure-event-hubs-go/v3 v3.3.16
+	github.com/Azure/azure-sdk-for-go v58.1.0+incompatible
+	github.com/Azure/azure-service-bus-go v0.11.2
 	github.com/Azure/azure-storage-blob-go v0.14.0
 	github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd
-	github.com/Azure/go-autorest/autorest v0.11.20
+	github.com/Azure/go-autorest/autorest v0.11.21
 	github.com/Azure/go-autorest/autorest/azure/auth v0.5.8
 	github.com/Huawei/gophercloud v1.0.21
-	github.com/Shopify/sarama v1.29.1
-	github.com/aws/aws-sdk-go v1.40.35
-	github.com/denisenkom/go-mssqldb v0.10.0
+	github.com/Shopify/sarama v1.30.0
+	github.com/aws/aws-sdk-go v1.41.0
+	github.com/denisenkom/go-mssqldb v0.11.0
 	github.com/go-logr/logr v0.4.0
 	github.com/go-playground/assert/v2 v2.0.1
 	github.com/go-redis/redis v6.15.9+incompatible
@@ -25,10 +25,10 @@ require (
 	github.com/google/go-cmp v0.5.6
 	github.com/hashicorp/vault/api v1.1.1
 	github.com/imdario/mergo v0.3.12
-	github.com/influxdata/influxdb-client-go/v2 v2.5.0
-	github.com/lib/pq v1.10.2
+	github.com/influxdata/influxdb-client-go/v2 v2.5.1
+	github.com/lib/pq v1.10.3
 	github.com/mitchellh/hashstructure v1.1.0
-	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.16.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0
@@ -37,22 +37,23 @@ require (
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/streadway/amqp v1.0.0
 	github.com/stretchr/testify v1.7.0
-	github.com/tidwall/gjson v1.9.0
+	github.com/tidwall/gjson v1.9.3
 	github.com/xdg/scram v1.0.3
-	go.mongodb.org/mongo-driver v1.7.1
-	google.golang.org/api v0.56.0
-	google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2
-	google.golang.org/grpc v1.40.0
+	github.com/xdg/stringprep v1.0.3 // indirect
+	go.mongodb.org/mongo-driver v1.7.3
+	google.golang.org/api v0.58.0
+	google.golang.org/genproto v0.0.0-20211011165927-a5fb3255271e
+	google.golang.org/grpc v1.41.0
 	google.golang.org/protobuf v1.27.1
-	k8s.io/api v0.22.1
-	k8s.io/apimachinery v0.22.1
-	k8s.io/apiserver v0.22.1
-	k8s.io/client-go v0.22.1
-	k8s.io/code-generator v0.22.1
+	k8s.io/api v0.22.2
+	k8s.io/apimachinery v0.22.2
+	k8s.io/apiserver v0.22.2
+	k8s.io/client-go v0.22.2
+	k8s.io/code-generator v0.22.2
 	k8s.io/klog/v2 v2.10.0
-	k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8
-	k8s.io/metrics v0.22.1
-	knative.dev/pkg v0.0.0-20210830224055-82f3a9f1c5bc
-	sigs.k8s.io/controller-runtime v0.10.0
+	k8s.io/kube-openapi v0.0.0-20210929172449-94abcedd1aa4
+	k8s.io/metrics v0.22.2
+	knative.dev/pkg v0.0.0-20211006213726-9179f78dcf97
+	sigs.k8s.io/controller-runtime v0.10.2
 	sigs.k8s.io/custom-metrics-apiserver v1.22.0
 )