From f676dad0ec3b8844ba526a70ef059791c9be344a Mon Sep 17 00:00:00 2001 From: Bart Smykla Date: Fri, 20 Oct 2023 07:13:43 +0200 Subject: [PATCH] chore(helm): allow to set log level for {in|e}gress (#8077) Signed-off-by: Bart Smykla --- deployments/charts/kuma/README.md | 2 ++ deployments/charts/kuma/templates/egress-deployment.yaml | 2 +- deployments/charts/kuma/templates/ingress-deployment.yaml | 2 +- deployments/charts/kuma/values.yaml | 6 ++++++ docs/generated/raw/helm-values.yaml | 6 ++++++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/deployments/charts/kuma/README.md b/deployments/charts/kuma/README.md index c7afa12301a9..26a1bdc8bc21 100644 --- a/deployments/charts/kuma/README.md +++ b/deployments/charts/kuma/README.md @@ -125,6 +125,7 @@ A Helm chart for the Kuma Control Plane | ingress.extraLabels | object | `{}` | Labels to add to resources, in addition to default labels | | ingress.drainTime | string | `"30s"` | Time for which old listener will still be active as draining | | ingress.replicas | int | `1` | Number of replicas of the Ingress. Ignored when autoscaling is enabled. | +| ingress.logLevel | string | `"info"` | Log level for ingress (available values: off|info|debug) | | ingress.resources | object | `{"limits":{"cpu":"1000m","memory":"512Mi"},"requests":{"cpu":"50m","memory":"64Mi"}}` | Define the resources to allocate to mesh ingress | | ingress.lifecycle | object | `{}` | Pod lifecycle settings (useful for adding a preStop hook, when using AWS ALB or NLB) | | ingress.terminationGracePeriodSeconds | int | `40` | Number of seconds to wait before force killing the pod. Make sure to update this if you add a preStop hook. | @@ -155,6 +156,7 @@ A Helm chart for the Kuma Control Plane | egress.extraLabels | object | `{}` | Labels to add to resources, in addition to the default labels. | | egress.drainTime | string | `"30s"` | Time for which old listener will still be active as draining | | egress.replicas | int | `1` | Number of replicas of the Egress. Ignored when autoscaling is enabled. | +| egress.logLevel | string | `"info"` | Log level for egress (available values: off|info|debug) | | egress.autoscaling.enabled | bool | `false` | Whether to enable Horizontal Pod Autoscaling, which requires the [Metrics Server](https://github.com/kubernetes-sigs/metrics-server) in the cluster | | egress.autoscaling.minReplicas | int | `2` | The minimum CP pods to allow | | egress.autoscaling.maxReplicas | int | `5` | The max CP pods to scale to | diff --git a/deployments/charts/kuma/templates/egress-deployment.yaml b/deployments/charts/kuma/templates/egress-deployment.yaml index b3ca0bd9ffbb..356df964c297 100644 --- a/deployments/charts/kuma/templates/egress-deployment.yaml +++ b/deployments/charts/kuma/templates/egress-deployment.yaml @@ -74,7 +74,7 @@ spec: value: "egress" args: - run - - --log-level=info + - --log-level={{ .Values.egress.logLevel | default "info" }} ports: - containerPort: 10002 livenessProbe: diff --git a/deployments/charts/kuma/templates/ingress-deployment.yaml b/deployments/charts/kuma/templates/ingress-deployment.yaml index d8fa5750c068..3264a8be9254 100644 --- a/deployments/charts/kuma/templates/ingress-deployment.yaml +++ b/deployments/charts/kuma/templates/ingress-deployment.yaml @@ -75,7 +75,7 @@ spec: value: "ingress" args: - run - - --log-level=info + - --log-level={{ .Values.ingress.logLevel | default "info" }} ports: - containerPort: 10001 livenessProbe: diff --git a/deployments/charts/kuma/values.yaml b/deployments/charts/kuma/values.yaml index e7c426f634e3..ffb753047d9a 100644 --- a/deployments/charts/kuma/values.yaml +++ b/deployments/charts/kuma/values.yaml @@ -406,6 +406,9 @@ ingress: # -- Number of replicas of the Ingress. Ignored when autoscaling is enabled. replicas: 1 + # -- Log level for ingress (available values: off|info|debug) + logLevel: info + # -- Define the resources to allocate to mesh ingress resources: requests: @@ -526,6 +529,9 @@ egress: # -- Number of replicas of the Egress. Ignored when autoscaling is enabled. replicas: 1 + # -- Log level for egress (available values: off|info|debug) + logLevel: info + # Horizontal Pod Autoscaling configuration autoscaling: # -- Whether to enable Horizontal Pod Autoscaling, which requires the [Metrics Server](https://github.com/kubernetes-sigs/metrics-server) in the cluster diff --git a/docs/generated/raw/helm-values.yaml b/docs/generated/raw/helm-values.yaml index e7c426f634e3..ffb753047d9a 100644 --- a/docs/generated/raw/helm-values.yaml +++ b/docs/generated/raw/helm-values.yaml @@ -406,6 +406,9 @@ ingress: # -- Number of replicas of the Ingress. Ignored when autoscaling is enabled. replicas: 1 + # -- Log level for ingress (available values: off|info|debug) + logLevel: info + # -- Define the resources to allocate to mesh ingress resources: requests: @@ -526,6 +529,9 @@ egress: # -- Number of replicas of the Egress. Ignored when autoscaling is enabled. replicas: 1 + # -- Log level for egress (available values: off|info|debug) + logLevel: info + # Horizontal Pod Autoscaling configuration autoscaling: # -- Whether to enable Horizontal Pod Autoscaling, which requires the [Metrics Server](https://github.com/kubernetes-sigs/metrics-server) in the cluster