From d0ab394b3e8a224e1de0767deb2e14d6c268ee1d Mon Sep 17 00:00:00 2001 From: Matias Costa Date: Fri, 18 Feb 2022 08:55:59 +0000 Subject: [PATCH 1/3] Add option to enable debug logs to helm chart --- deploy/kubernetes/helm/sloth/templates/deployment.yaml | 3 +++ deploy/kubernetes/helm/sloth/values.yaml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/deploy/kubernetes/helm/sloth/templates/deployment.yaml b/deploy/kubernetes/helm/sloth/templates/deployment.yaml index 93bbabba..0130b27b 100644 --- a/deploy/kubernetes/helm/sloth/templates/deployment.yaml +++ b/deploy/kubernetes/helm/sloth/templates/deployment.yaml @@ -52,6 +52,9 @@ spec: {{- if .Values.customSloConfig.enabled }} - --slo-period-windows-path={{ .Values.customSloConfig.path }} {{- end }} + {{- if .Values.sloth.debug.enabled }} + - --debug + {{- end}} {{- if .Values.metrics.enabled }} ports: - containerPort: 8081 diff --git a/deploy/kubernetes/helm/sloth/values.yaml b/deploy/kubernetes/helm/sloth/values.yaml index 58c63573..e22ff3a6 100644 --- a/deploy/kubernetes/helm/sloth/values.yaml +++ b/deploy/kubernetes/helm/sloth/values.yaml @@ -11,6 +11,8 @@ sloth: namespace: "" # The namespace where sloth will the CRs to process. extraLabels: {} # Labels that will be added to all the generated SLO Rules. defaultSloPeriod: "" # The slo period used by sloth (e.g. 30d) + debug: + enabled: false commonPlugins: enabled: true From f87d3098b820108ce45ce933230b76e95eefbada Mon Sep 17 00:00:00 2001 From: Matias Costa Date: Fri, 18 Feb 2022 08:58:27 +0000 Subject: [PATCH 2/3] Add option to enable debug logs to helm chart --- 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 ed65e567..bae39b15 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.4.1 +version: 0.4.2 From 0f660daf0b951b8fbbfc842750faf81e57d44375 Mon Sep 17 00:00:00 2001 From: Matias Costa Date: Mon, 21 Feb 2022 12:33:58 +0000 Subject: [PATCH 3/3] Fix tests output to use new chart version --- .../tests/testdata/output/cluster_role_binding_custom.yaml | 2 +- .../tests/testdata/output/cluster_role_binding_default.yaml | 2 +- .../helm/sloth/tests/testdata/output/cluster_role_custom.yaml | 2 +- .../sloth/tests/testdata/output/cluster_role_default.yaml | 2 +- .../sloth/tests/testdata/output/configmap_slo_config.yaml | 2 +- .../helm/sloth/tests/testdata/output/deployment_custom.yaml | 4 ++-- .../tests/testdata/output/deployment_custom_no_extras.yaml | 4 ++-- .../tests/testdata/output/deployment_custom_slo_config.yaml | 4 ++-- .../helm/sloth/tests/testdata/output/deployment_default.yaml | 4 ++-- .../helm/sloth/tests/testdata/output/pod_monitor_custom.yaml | 2 +- .../helm/sloth/tests/testdata/output/pod_monitor_default.yaml | 2 +- .../helm/sloth/tests/testdata/output/sa_custom.yaml | 2 +- .../helm/sloth/tests/testdata/output/sa_default.yaml | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_binding_custom.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_binding_custom.yaml index 9df2753d..a49cebec 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_binding_custom.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_binding_custom.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: sloth-test labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_binding_default.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_binding_default.yaml index ec0964e9..f75ae22f 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_binding_default.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_binding_default.yaml @@ -5,7 +5,7 @@ kind: ClusterRoleBinding metadata: name: sloth labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_custom.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_custom.yaml index fab6cff2..dedb95fc 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_custom.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_custom.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: sloth-test labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_default.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_default.yaml index 6b4470cc..ba4460cc 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_default.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/cluster_role_default.yaml @@ -5,7 +5,7 @@ kind: ClusterRole metadata: name: sloth labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/configmap_slo_config.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/configmap_slo_config.yaml index 3223a130..5a8d5e79 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/configmap_slo_config.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/configmap_slo_config.yaml @@ -6,7 +6,7 @@ metadata: name: sloth-test namespace: custom labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth 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 77e36c76..a4164c2e 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom.yaml @@ -6,7 +6,7 @@ metadata: name: sloth-test namespace: custom labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth @@ -22,7 +22,7 @@ spec: template: metadata: labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth 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 65fbbb50..ed84a9e3 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 @@ -6,7 +6,7 @@ metadata: name: sloth-test namespace: custom labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth @@ -22,7 +22,7 @@ spec: template: metadata: labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth 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 389547c6..8f12e3c3 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 @@ -6,7 +6,7 @@ metadata: name: sloth-test namespace: custom labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth @@ -22,7 +22,7 @@ spec: template: metadata: labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth 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 3100e87b..cd192ce8 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_default.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_default.yaml @@ -6,7 +6,7 @@ metadata: name: sloth namespace: default labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth @@ -21,7 +21,7 @@ spec: template: metadata: labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/pod_monitor_custom.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/pod_monitor_custom.yaml index 8f072d18..8909ccb1 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/pod_monitor_custom.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/pod_monitor_custom.yaml @@ -6,7 +6,7 @@ metadata: name: sloth-test namespace: custom labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/pod_monitor_default.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/pod_monitor_default.yaml index b58cd252..e41451a2 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/pod_monitor_default.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/pod_monitor_default.yaml @@ -6,7 +6,7 @@ metadata: name: sloth namespace: default labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/sa_custom.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/sa_custom.yaml index edec3f3b..3c4692da 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/sa_custom.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/sa_custom.yaml @@ -6,7 +6,7 @@ metadata: name: sloth-test namespace: custom labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/sa_default.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/sa_default.yaml index 2f61d4d1..5752e1ae 100644 --- a/deploy/kubernetes/helm/sloth/tests/testdata/output/sa_default.yaml +++ b/deploy/kubernetes/helm/sloth/tests/testdata/output/sa_default.yaml @@ -6,7 +6,7 @@ metadata: name: sloth namespace: default labels: - helm.sh/chart: sloth-0.4.1 + helm.sh/chart: sloth-0.4.2 app.kubernetes.io/managed-by: Helm app: sloth app.kubernetes.io/name: sloth