From a2ebaf5091582b2d4f77a6722359d8884294612f Mon Sep 17 00:00:00 2001 From: Roland Bapst <33862357+rbapst-tamedia@users.noreply.github.com> Date: Thu, 26 Dec 2024 10:37:52 +0100 Subject: [PATCH 1/5] Adjust fluent-op request Because of alert. Operator uses 30MiB with max=37 on last 2 days --- files/helm/fluent-operator/common.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/files/helm/fluent-operator/common.yaml b/files/helm/fluent-operator/common.yaml index 2c3892f..1adae68 100644 --- a/files/helm/fluent-operator/common.yaml +++ b/files/helm/fluent-operator/common.yaml @@ -1,6 +1,13 @@ containerRuntime: containerd operator: priorityClassName: system-cluster-critical + resources: + limits: + cpu: 100m + memory: 60Mi + requests: + cpu: 100m + memory: 40Mi fluentbit: enabled: true priorityClassName: system-node-critical From fc015de29d995156dc1f5aa4ac1524c201264ca1 Mon Sep 17 00:00:00 2001 From: Roland Bapst Date: Fri, 27 Dec 2024 11:12:03 +0100 Subject: [PATCH 2/5] remove limits and increase mem request --- files/helm/fluent-operator/common.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/files/helm/fluent-operator/common.yaml b/files/helm/fluent-operator/common.yaml index 1adae68..c0edb40 100644 --- a/files/helm/fluent-operator/common.yaml +++ b/files/helm/fluent-operator/common.yaml @@ -2,12 +2,9 @@ containerRuntime: containerd operator: priorityClassName: system-cluster-critical resources: - limits: - cpu: 100m - memory: 60Mi requests: cpu: 100m - memory: 40Mi + memory: 100Mi fluentbit: enabled: true priorityClassName: system-node-critical From e228b5bf3a19235ff6394eb40bf0b0e940948b26 Mon Sep 17 00:00:00 2001 From: Roland Bapst Date: Fri, 27 Dec 2024 15:38:41 +0100 Subject: [PATCH 3/5] test: set null for limits to remove default --- files/helm/fluent-operator/common.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/files/helm/fluent-operator/common.yaml b/files/helm/fluent-operator/common.yaml index c0edb40..1f4ac91 100644 --- a/files/helm/fluent-operator/common.yaml +++ b/files/helm/fluent-operator/common.yaml @@ -2,6 +2,9 @@ containerRuntime: containerd operator: priorityClassName: system-cluster-critical resources: + limits: + cpu: + memory: requests: cpu: 100m memory: 100Mi From d83261684f98fc707621f1fc56f1e9c9b60b057d Mon Sep 17 00:00:00 2001 From: Samuel <15628653+swibrow@users.noreply.github.com> Date: Fri, 17 Jan 2025 05:42:58 +0100 Subject: [PATCH 4/5] fix: set limits --- files/helm/fluent-operator/common.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/helm/fluent-operator/common.yaml b/files/helm/fluent-operator/common.yaml index 1f4ac91..d968080 100644 --- a/files/helm/fluent-operator/common.yaml +++ b/files/helm/fluent-operator/common.yaml @@ -2,12 +2,12 @@ containerRuntime: containerd operator: priorityClassName: system-cluster-critical resources: - limits: - cpu: - memory: requests: cpu: 100m memory: 100Mi + limits: + cpu: 200m + memory: 200Mi fluentbit: enabled: true priorityClassName: system-node-critical From 5220bead992a17a5254f4aab48de50c3f2f9396e Mon Sep 17 00:00:00 2001 From: Samuel <15628653+swibrow@users.noreply.github.com> Date: Fri, 17 Jan 2025 06:06:33 +0100 Subject: [PATCH 5/5] chore: pre-commit --- .pre-commit-config.yaml | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9e46c3e..092ea4e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.96.1 + rev: v1.97.0 hooks: - id: terraform_fmt args: @@ -35,7 +35,7 @@ repos: - id: trailing-whitespace - id: no-commit-to-branch - repo: https://github.com/renovatebot/pre-commit-hooks - rev: 38.112.0 + rev: 39.113.0 hooks: - id: renovate-config-validator - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks diff --git a/README.md b/README.md index d6ec8be..0b3bd1b 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ as described in the `.pre-commit-config.yaml` file | [amp](#module\_amp) | terraform-aws-modules/managed-service-prometheus/aws | 3.0.0 | | [cluster\_secret\_store](#module\_cluster\_secret\_store) | ./modules/addon | n/a | | [downscaler](#module\_downscaler) | tx-pts-dai/downscaler/kubernetes | 0.3.1 | -| [ebs\_csi\_driver\_irsa](#module\_ebs\_csi\_driver\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.52.1 | +| [ebs\_csi\_driver\_irsa](#module\_ebs\_csi\_driver\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.52.2 | | [eks](#module\_eks) | terraform-aws-modules/eks/aws | 20.31.6 | | [fluent\_operator](#module\_fluent\_operator) | ./modules/addon | n/a | | [grafana](#module\_grafana) | ./modules/addon | n/a | @@ -167,13 +167,13 @@ as described in the `.pre-commit-config.yaml` file | [network](#module\_network) | ./modules/network | n/a | | [okta\_secrets](#module\_okta\_secrets) | ./modules/addon | n/a | | [pagerduty\_secrets](#module\_pagerduty\_secrets) | ./modules/addon | n/a | -| [prometheus\_irsa](#module\_prometheus\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.52.1 | +| [prometheus\_irsa](#module\_prometheus\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.52.2 | | [prometheus\_operator\_crds](#module\_prometheus\_operator\_crds) | ./modules/addon | n/a | | [prometheus\_stack](#module\_prometheus\_stack) | ./modules/addon | n/a | | [reloader](#module\_reloader) | ./modules/addon | n/a | | [slack\_secrets](#module\_slack\_secrets) | ./modules/addon | n/a | | [ssm](#module\_ssm) | ./modules/ssm | n/a | -| [vpc\_cni\_irsa](#module\_vpc\_cni\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.52.1 | +| [vpc\_cni\_irsa](#module\_vpc\_cni\_irsa) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | 5.52.2 | ## Resources