diff --git a/plugins/scheduler-k3s/templates/chart/deployment.yaml b/plugins/scheduler-k3s/templates/chart/deployment.yaml index a741804d1..0fa6d45b2 100644 --- a/plugins/scheduler-k3s/templates/chart/deployment.yaml +++ b/plugins/scheduler-k3s/templates/chart/deployment.yaml @@ -1,8 +1,4 @@ {{- range $processName, $config := .Values.processes }} -{{- if not (hasKey $config "web") }} -# Skip {{ $processName }} as it doesn't have a web section -{{- continue }} -{{- end }} {{- $mappings := dict }} {{- if hasKey $config "web" }} diff --git a/plugins/scheduler-k3s/templates/chart/keda-scaled-object.yaml b/plugins/scheduler-k3s/templates/chart/keda-scaled-object.yaml index 3f37603ac..6487f7c7c 100644 --- a/plugins/scheduler-k3s/templates/chart/keda-scaled-object.yaml +++ b/plugins/scheduler-k3s/templates/chart/keda-scaled-object.yaml @@ -1,11 +1,7 @@ {{- if .Capabilities.APIVersions.Has "keda.sh/v1alpha1" -}} {{- range $processName, $config := .Values.processes }} -{{- if not (hasKey $config "web") }} -# Skip {{ $processName }} as it doesn't have a web section -{{- continue }} -{{- end }} -{{- if and $config.autoscaling (and $config.autoscaling.enabled (eq $config.autoscaling.type "keda")) }} +{{- if and (hasKey $config "autoscaling") (and $config.autoscaling.enabled (eq $config.autoscaling.type "keda")) }} --- apiVersion: keda.sh/v1alpha1 kind: ScaledObject diff --git a/tests/unit/scheduler-k3s-3.bats b/tests/unit/scheduler-k3s-3.bats index c6dba70c6..b4c2ca5d9 100644 --- a/tests/unit/scheduler-k3s-3.bats +++ b/tests/unit/scheduler-k3s-3.bats @@ -29,6 +29,11 @@ teardown_() { echo "status: $status" assert_success + run /bin/bash -c "dokku ps:scale $TEST_APP web=1 worker=2" + echo "output: $output" + echo "status: $status" + assert_success + run deploy_app python dokku@$DOKKU_DOMAIN:$TEST_APP inject_kustomization_yaml echo "output: $output" echo "status: $status" @@ -39,6 +44,12 @@ teardown_() { echo "status: $status" assert_success assert_output "3" + + run /bin/bash -c "kubectl get deployment $TEST_APP-worker -o json | jq -r '.spec.replicas'" + echo "output: $output" + echo "status: $status" + assert_success + assert_output "2" } inject_kustomization_yaml() { @@ -58,8 +69,9 @@ patches: path: /spec/replicas value: 3 target: - group: apps - version: v1 - kind: Deployment + group: apps + version: v1 + kind: Deployment + name: $TEST_APP-worker EOF }