From 731caca7597b0dcba29ad3d33f0f143b97928867 Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Mon, 14 Nov 2022 15:06:11 +0100 Subject: [PATCH 1/3] Add: specify logger to use Signed-off-by: Nicolas Lamirault --- deploy/kubernetes/helm/sloth/templates/deployment.yaml | 1 + deploy/kubernetes/helm/sloth/values.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/deploy/kubernetes/helm/sloth/templates/deployment.yaml b/deploy/kubernetes/helm/sloth/templates/deployment.yaml index 55fc1cdc..f4b75491 100644 --- a/deploy/kubernetes/helm/sloth/templates/deployment.yaml +++ b/deploy/kubernetes/helm/sloth/templates/deployment.yaml @@ -59,6 +59,7 @@ spec: {{- if .Values.customSloConfig.enabled }} - --slo-period-windows-path={{ .Values.customSloConfig.path }} {{- end }} + - --logger={{ .Values.sloth.logger }} {{- if .Values.sloth.debug.enabled }} - --debug {{- end}} diff --git a/deploy/kubernetes/helm/sloth/values.yaml b/deploy/kubernetes/helm/sloth/values.yaml index b9c1548a..8c8b309d 100644 --- a/deploy/kubernetes/helm/sloth/values.yaml +++ b/deploy/kubernetes/helm/sloth/values.yaml @@ -27,6 +27,8 @@ sloth: optimizedRules: true # Reduce prom load for calculating period window burnrates. debug: enabled: false + # Could be: default or json + logger: default commonPlugins: enabled: true From c1b9bae3d7b87e10450b53e6be2125f1d07fe287 Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Mon, 14 Nov 2022 15:11:32 +0100 Subject: [PATCH 2/3] Fix: tests for logger Signed-off-by: Nicolas Lamirault --- .../helm/sloth/tests/testdata/output/deployment_custom.yaml | 1 + .../sloth/tests/testdata/output/deployment_custom_no_extras.yaml | 1 + .../tests/testdata/output/deployment_custom_slo_config.yaml | 1 + .../helm/sloth/tests/testdata/output/deployment_default.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom.yaml index 86a0a8ed..1b7b0ff1 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom.yaml @@ -50,6 +50,7 @@ spec: - --extra-labels=k2=v2 - --sli-plugins-path=/plugins - --disable-optimized-rules + - --logger=default ports: - containerPort: 8081 name: metrics diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_no_extras.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_no_extras.yaml index 17c9447e..c2d4ab0d 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_no_extras.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_no_extras.yaml @@ -49,6 +49,7 @@ spec: - --extra-labels=k1=v1 - --extra-labels=k2=v2 - --disable-optimized-rules + - --logger=default securityContext: allowPrivilegeEscalation: false resources: diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_slo_config.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_slo_config.yaml index 83caaaef..6dbd8b11 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_slo_config.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_slo_config.yaml @@ -51,6 +51,7 @@ spec: - --extra-labels=k2=v2 - --disable-optimized-rules - --slo-period-windows-path=/windows + - --logger=default ports: - containerPort: 8081 name: metrics diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_default.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_default.yaml index 27c7f61a..2d19c3a5 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_default.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_default.yaml @@ -36,6 +36,7 @@ spec: args: - kubernetes-controller - --sli-plugins-path=/plugins + - --logger=default ports: - containerPort: 8081 name: metrics From 687c3859148e637216b32430a8c96224e85bb110 Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Mon, 14 Nov 2022 15:12:43 +0100 Subject: [PATCH 3/3] Update: bump chart version Signed-off-by: Nicolas Lamirault --- deploy/kubernetes/helm/sloth/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kubernetes/helm/sloth/Chart.yaml b/deploy/kubernetes/helm/sloth/Chart.yaml index b855c087..b1250cfc 100644 --- a/deploy/kubernetes/helm/sloth/Chart.yaml +++ b/deploy/kubernetes/helm/sloth/Chart.yaml @@ -4,4 +4,4 @@ description: Base chart for Sloth. type: application home: https://github.com/slok/sloth kubeVersion: ">= 1.19.0-0" -version: 0.6.4 +version: 0.7.0