-
Notifications
You must be signed in to change notification settings - Fork 14.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support KEDA scaling for triggerer in the helm chart
Signed-off-by: Hussein Awala <[email protected]>
- Loading branch information
1 parent
df4c883
commit 9afa248
Showing
8 changed files
with
321 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| {{/* | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| */}} | ||
|
|
||
| ################################ | ||
| ## Airflow Triggerer KEDA Scaler | ||
| ################################# | ||
| {{- if semverCompare ">=2.2.0" .Values.airflowVersion }} | ||
| {{- if .Values.triggerer.enabled }} | ||
| apiVersion: keda.sh/v1alpha1 | ||
| kind: ScaledObject | ||
| metadata: | ||
| name: {{ .Release.Name }}-triggerer | ||
| labels: | ||
| tier: airflow | ||
| component: triggerer-horizontalpodautoscaler | ||
| release: {{ .Release.Name }} | ||
| chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" | ||
| heritage: {{ .Release.Service }} | ||
| deploymentName: {{ .Release.Name }}-triggerer | ||
| {{- if or (.Values.labels) (.Values.triggerer.labels) }} | ||
| {{- mustMerge .Values.triggerer.labels .Values.labels | toYaml | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| scaleTargetRef: | ||
| kind: {{ ternary "StatefulSet" "Deployment" .Values.triggerer.persistence.enabled }} | ||
| name: {{ .Release.Name }}-triggerer | ||
| pollingInterval: {{ .Values.triggerer.keda.pollingInterval }} | ||
| cooldownPeriod: {{ .Values.triggerer.keda.cooldownPeriod }} | ||
| minReplicaCount: {{ .Values.triggerer.keda.minReplicaCount }} | ||
| maxReplicaCount: {{ .Values.triggerer.keda.maxReplicaCount }} | ||
| {{- if .Values.triggerer.keda.advanced }} | ||
| advanced: {{- toYaml .Values.triggerer.keda.advanced | nindent 4 }} | ||
| {{- end }} | ||
| triggers: | ||
| - type: postgresql | ||
| metadata: | ||
| targetQueryValue: "1" | ||
| connectionFromEnv: AIRFLOW_CONN_AIRFLOW_DB | ||
| query: >- | ||
| SELECT ceil(COUNT(*)::decimal / {{ .Values.config.triggerer.default_capacity }}) | ||
| FROM trigger | ||
| {{- end }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -561,3 +561,118 @@ def test_exporter_secret_with_overrides(self): | |
| "postgresql://username%40123123:password%40%21%40%23$%5E&%2A%28%[email protected]:1111" | ||
| "/pgbouncer?sslmode=require" == connection | ||
| ) | ||
|
|
||
|
|
||
| class TestPgbouncerNetworkPolicy: | ||
| def test_should_create_pgbouncer_network_policy(self): | ||
| docs = render_chart( | ||
| values={"pgbouncer": {"enabled": True}, "networkPolicies": {"enabled": True}}, | ||
| show_only=["templates/pgbouncer/pgbouncer-networkpolicy.yaml"], | ||
| ) | ||
|
|
||
| assert "NetworkPolicy" == jmespath.search("kind", docs[0]) | ||
| assert "release-name-pgbouncer-policy" == jmespath.search("metadata.name", docs[0]) | ||
|
|
||
| @pytest.mark.parametrize( | ||
| "conf, expected_selector", | ||
| [ | ||
| # test with workers.keda enabled without namespace labels | ||
| ( | ||
| {"executor": "CeleryExecutor", "workers": {"keda": {"enabled": True}}}, | ||
| [{"podSelector": {"matchLabels": {"app": "keda-operator"}}}], | ||
| ), | ||
| # test with triggerer.keda enabled without namespace labels | ||
| ( | ||
| {"triggerer": {"keda": {"enabled": True}}}, | ||
| [{"podSelector": {"matchLabels": {"app": "keda-operator"}}}], | ||
| ), | ||
| # test with workers.keda and triggerer.keda both enabled without namespace labels | ||
| ( | ||
| { | ||
| "executor": "CeleryExecutor", | ||
| "workers": {"keda": {"enabled": True}}, | ||
| "triggerer": {"keda": {"enabled": True}}, | ||
| }, | ||
| [{"podSelector": {"matchLabels": {"app": "keda-operator"}}}], | ||
| ), | ||
| # test with workers.keda enabled with namespace labels | ||
| ( | ||
| { | ||
| "executor": "CeleryExecutor", | ||
| "workers": {"keda": {"enabled": True, "namespaceLabels": {"app": "airflow"}}}, | ||
| }, | ||
| [ | ||
| { | ||
| "namespaceSelector": {"matchLabels": {"app": "airflow"}}, | ||
| "podSelector": {"matchLabels": {"app": "keda-operator"}}, | ||
| } | ||
| ], | ||
| ), | ||
| # test with triggerer.keda enabled with namespace labels | ||
| ( | ||
| {"triggerer": {"keda": {"enabled": True, "namespaceLabels": {"app": "airflow"}}}}, | ||
| [ | ||
| { | ||
| "namespaceSelector": {"matchLabels": {"app": "airflow"}}, | ||
| "podSelector": {"matchLabels": {"app": "keda-operator"}}, | ||
| } | ||
| ], | ||
| ), | ||
| # test with workers.keda and triggerer.keda both enabled with namespace labels | ||
| ( | ||
| { | ||
| "executor": "CeleryExecutor", | ||
| "workers": {"keda": {"enabled": True, "namespaceLabels": {"app": "airflow"}}}, | ||
| "triggerer": {"keda": {"enabled": True, "namespaceLabels": {"app": "airflow"}}}, | ||
| }, | ||
| [ | ||
| { | ||
| "namespaceSelector": {"matchLabels": {"app": "airflow"}}, | ||
| "podSelector": {"matchLabels": {"app": "keda-operator"}}, | ||
| } | ||
| ], | ||
| ), | ||
| # test with workers.keda and triggerer.keda both enabled workers with namespace labels | ||
| # and triggerer without namespace labels | ||
| ( | ||
| { | ||
| "executor": "CeleryExecutor", | ||
| "workers": {"keda": {"enabled": True, "namespaceLabels": {"app": "airflow"}}}, | ||
| "triggerer": {"keda": {"enabled": True}}, | ||
| }, | ||
| [ | ||
| { | ||
| "namespaceSelector": {"matchLabels": {"app": "airflow"}}, | ||
| "podSelector": {"matchLabels": {"app": "keda-operator"}}, | ||
| } | ||
| ], | ||
| ), | ||
| # test with workers.keda and triggerer.keda both enabled workers without namespace labels | ||
| # and triggerer with namespace labels | ||
| ( | ||
| { | ||
| "executor": "CeleryExecutor", | ||
| "workers": {"keda": {"enabled": True}}, | ||
| "triggerer": {"keda": {"enabled": True, "namespaceLabels": {"app": "airflow"}}}, | ||
| }, | ||
| [ | ||
| { | ||
| "namespaceSelector": {"matchLabels": {"app": "airflow"}}, | ||
| "podSelector": {"matchLabels": {"app": "keda-operator"}}, | ||
| } | ||
| ], | ||
| ), | ||
| ], | ||
| ) | ||
| def test_pgbouncer_network_policy_with_keda(self, conf, expected_selector): | ||
|
|
||
| docs = render_chart( | ||
| values={ | ||
| "pgbouncer": {"enabled": True}, | ||
| "networkPolicies": {"enabled": True}, | ||
| **conf, | ||
| }, | ||
| show_only=["templates/pgbouncer/pgbouncer-networkpolicy.yaml"], | ||
| ) | ||
|
|
||
| assert expected_selector == jmespath.search("spec.ingress[0].from[1:]", docs[0]) | ||