Skip to content

Commit d0497e5

Browse files
Merge branch 'main' into add-metrics-api-aggregation-from-kube-service-feature
Signed-off-by: julianguinard <[email protected]>
2 parents e3925e0 + 3fef646 commit d0497e5

File tree

3,455 files changed

+295549
-81891
lines changed

Some content is hidden

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

3,455 files changed

+295549
-81891
lines changed

.github/reviewers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55

66
# Any datadog file in pkg or tests folder
77
"+(pkg|tests)/**/datadog*.go":
8-
- arapulido
8+
- team: keda-core-datadog-notification

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
6565
- **General**: Add error and event for mismatching input property ([#6721](https://github.com/kedacore/keda/issues/6721))
6666
- **General**: Add fallback support for triggers of `Value` metric type ([#6655](https://github.com/kedacore/keda/pull/6655))
6767
- **General**: Add support for pause scale in annotation ([#6902](https://github.com/kedacore/keda/issues/6902))
68+
- **General**: Add support for pause scale out annotation ([#7022](https://github.com/kedacore/keda/issues/7022))
6869
- **General**: Enable support on s390x for KEDA ([#6543](https://github.com/kedacore/keda/issues/6543))
6970
- **General**: Implement Force Activation annotation ([#6903](https://github.com/kedacore/keda/issues/6903))
71+
- **General**: Introduce new Forgejo Scaler ([#6488](https://github.com/kedacore/keda/issues/6488))
7072
- **General**: Introduce new Solace Direct Messaging scaler ([#6545](https://github.com/kedacore/keda/issues/6545))
7173
- **General**: Introduce new Sumo Logic Scaler ([#6734](https://github.com/kedacore/keda/issues/6734))
7274
- **General**: Support for declarative e2e test setup and filtering ([#6989](https://github.com/kedacore/keda/issues/6989))
@@ -87,9 +89,11 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
8789
- **Datadog Scaler**: Fix bug with datadogNamespace config ([#6828](https://github.com/kedacore/keda/pull/6828))
8890
- **Datadog Scaler**: Improve Datadog scaler error messages ([#6999](https://github.com/kedacore/keda/pull/6999))
8991
- **Github Scaler**: Add support to control unlabeled job/runner matching ([#6900](https://github.com/kedacore/keda/issues/6900))
92+
- **InfluxDB Scaler**: Add support for InfluxDB v3 ([#6981](https://github.com/kedacore/keda/issues/6981))
9093
- **Metrics API scaler**: Introduce new `aggregateFromKubeServiceEndpoints` and `aggregationType` metadata fields to `metrics-api` so it is able to fetch metrics from all endpoints behind a kubernetes service and aggregate them ([#6565](https://github.com/kedacore/keda/pull/6565))
9194
- **Metrics API Scaler**: Support AuthParams for authMode ([#6939](https://github.com/kedacore/keda/issues/6939))
9295
- **Metrics API Scaler**: Support multiple auth methods simultaneously ([#6642](https://github.com/kedacore/keda/issues/6642))
96+
- **Temporal Scaler**: Always set `temporal-namespace` header on requests([#7079](https://github.com/kedacore/keda/issues/7079))
9397
- **Temporal Scaler**: Support custom tlsServerName ([#6820](https://github.com/kedacore/keda/pull/6820))
9498

9599
### Fixes
@@ -105,8 +109,10 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
105109
- **General**: Sets hpaName in Status when ScaledObject adopts/finds an existing HPA ([#6336](https://github.com/kedacore/keda/issues/6336))
106110
- **Cron Scaler**: Fix cron scaler to return zero metric value by default([#6886](https://github.com/kedacore/keda/issues/6886))
107111
- **Hashicorp Vault**: Fix Vault PKI param using camel case param when making API call to Vault PKI endpoint ([#6864](https://github.com/kedacore/keda/issues/6864))
112+
- **Kafka Scaler**: Fix throwing error when using sasl=none ([#7061](https://github.com/kedacore/keda/issues/7061))
108113
- **Pulsar Scaler**: Resolve nil pointer dereference in Pulsar scaler redirect handling ([#7024](https://github.com/kedacore/keda/issues/7024))
109114
- **RabbitMQ Scaler**: Fix incorrect URL encoding in RabbitMQ vhosts containing %2f ([#6963](https://github.com/kedacore/keda/issues/6963))
115+
- **Temporal Scaler**: Allow setting 0 for targetQueueSize ([#7113](https://github.com/kedacore/keda/pull/7113))
110116

111117
### Deprecations
112118

@@ -125,6 +131,8 @@ New deprecation(s):
125131

126132
### Other
127133

134+
- **General**: Add gRPC service that allows subscribing to a raw metric values ([#7094](https://github.com/kedacore/keda/issues/7094))
135+
- **General**: Bump Controller Runtime version to v0.20.4 ([#7081](https://github.com/kedacore/keda/pull/7081))
128136
- **General**: Fix several typos ([#6909](https://github.com/kedacore/keda/pull/6909))
129137
- **General**: Replace deprecated webhook.Validator with webhook.CustomValidator ([#6660](https://github.com/kedacore/keda/issues/6660))
130138
- **MSSQL Scaler**: Refactor MS SQL e2e test ([#3401](https://github.com/kedacore/keda/issues/3401))

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ COSIGN_FLAGS ?= -y -a GIT_HASH=${GIT_COMMIT} -a GIT_VERSION=${VERSION} -a BUILD_
4747
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
4848
ENVTEST_K8S_VERSION = 1.32
4949

50-
GOLANGCI_VERSION:=1.63.4
50+
GOLANGCI_VERSION:=1.64.8
5151

5252
# Setting SHELL to bash allows bash commands to be executed by recipes.
5353
# This is a requirement for 'setup-envtest.sh' in the test target.
@@ -154,7 +154,7 @@ fmt: ## Run go fmt against code.
154154
vet: ## Run go vet against code.
155155
go vet ./...
156156

157-
HAS_GOLANGCI_VERSION:=$(shell $(GOPATH)/bin/golangci-lint version --format=short)
157+
HAS_GOLANGCI_VERSION:=$(shell $(GOPATH)/bin/golangci-lint version --short)
158158
.PHONY: golangci
159159
golangci: ## Run golangci against code.
160160
ifneq ($(HAS_GOLANGCI_VERSION), $(GOLANGCI_VERSION))

apis/keda/v1alpha1/scaledobject_types.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ const ValidationsHpaOwnershipAnnotation = "validations.keda.sh/hpa-ownership"
5858
const PausedReplicasAnnotation = "autoscaling.keda.sh/paused-replicas"
5959
const PausedAnnotation = "autoscaling.keda.sh/paused"
6060
const PausedScaleInAnnotation = "autoscaling.keda.sh/paused-scale-in"
61+
const PausedScaleOutAnnotation = "autoscaling.keda.sh/paused-scale-out"
6162
const FallbackBehaviorStatic = "static"
6263
const FallbackBehaviorCurrentReplicas = "currentReplicas"
6364
const FallbackBehaviorCurrentReplicasIfHigher = "currentReplicasIfHigher"
@@ -240,6 +241,11 @@ func (so *ScaledObject) NeedToForceActivation() bool {
240241
return getBoolAnnotation(so, ForceActivationAnnotation)
241242
}
242243

244+
// NeedToPauseScaleOut checks whether Scale Out actions for a ScaledObject need to be blocked based on the PausedScaleOut annotation
245+
func (so *ScaledObject) NeedToPauseScaleOut() bool {
246+
return getBoolAnnotation(so, PausedScaleOutAnnotation)
247+
}
248+
243249
func getBoolAnnotation(so *ScaledObject, annotation string) bool {
244250
value, found := so.GetAnnotations()[annotation]
245251
if !found {

cmd/adapter/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ func (a *Adapter) makeProvider(ctx context.Context) (provider.ExternalMetricsPro
109109
}
110110

111111
setupLog.Info("Connecting Metrics Service gRPC client to the server", "address", metricsServiceAddr)
112-
grpcClient, err := metricsservice.NewGrpcClient(ctx, metricsServiceAddr, a.SecureServing.ServerCert.CertDirectory, metricsServiceGRPCAuthority, clientMetrics)
112+
defaultConnectionCfg := ""
113+
grpcClient, err := metricsservice.NewGrpcClient(ctx, metricsServiceAddr, a.SecureServing.ServerCert.CertDirectory, metricsServiceGRPCAuthority, defaultConnectionCfg, clientMetrics, false)
113114
if err != nil {
114115
setupLog.Error(err, "error connecting Metrics Service gRPC client to the server", "address", metricsServiceAddr)
115116
return nil, err

0 commit comments

Comments
 (0)