From 233f51d90778866b3477a61a64bc4c58af26c140 Mon Sep 17 00:00:00 2001 From: FleetAdmiralButter Date: Thu, 22 Jun 2023 15:33:58 +1000 Subject: [PATCH 1/9] Ability to configure affinity/tolerations on FluentD --- charts/lagoon-logging/templates/logging.yaml | 8 ++++++++ charts/lagoon-logging/values.yaml | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/charts/lagoon-logging/templates/logging.yaml b/charts/lagoon-logging/templates/logging.yaml index a037df96..3f73dc6a 100644 --- a/charts/lagoon-logging/templates/logging.yaml +++ b/charts/lagoon-logging/templates/logging.yaml @@ -13,6 +13,14 @@ spec: fsGroup: 0 scaling: replicas: {{ .Values.fluentdReplicaCount }} + {{- with .Values.fluentd.affinity }} + affinity: + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.fluentd.tolerations }} + tolerations: + {{- toYaml . | nindent 6 }} + {{- end }} {{- with .Values.fluentdMetrics }} metrics: {{- toYaml . | nindent 6 }} diff --git a/charts/lagoon-logging/values.yaml b/charts/lagoon-logging/values.yaml index 7505be41..92c689b4 100644 --- a/charts/lagoon-logging/values.yaml +++ b/charts/lagoon-logging/values.yaml @@ -251,6 +251,11 @@ enableDefaultForwarding: true # Set how many fluentd pods should be running fluentdReplicaCount: 3 +fluentd: + tolerations: [] + + affinity: {} + # Add tolerations to the fluentbit daemonset so that it runs on e.g. # load-balancer nodes. fluentbitTolerations: From 64782fa67979ec8d8c1004670d61ed69183a00a2 Mon Sep 17 00:00:00 2001 From: FleetAdmiralButter Date: Thu, 22 Jun 2023 15:39:28 +1000 Subject: [PATCH 2/9] Bump lagoon-logging to 0.79.0 --- charts/lagoon-logging/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml index 76cd9361..d6a09344 100644 --- a/charts/lagoon-logging/Chart.yaml +++ b/charts/lagoon-logging/Chart.yaml @@ -19,7 +19,7 @@ type: application # time you make changes to the chart and its templates, including the app # version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.78.0 +version: 0.79.0 dependencies: - name: logging-operator From 3cb44a45afe7d4fe2a68f0676acd114a5209ae95 Mon Sep 17 00:00:00 2001 From: FleetAdmiralButter Date: Thu, 22 Jun 2023 16:42:32 +1000 Subject: [PATCH 3/9] Unnest affinity/toleration and update changelog --- charts/lagoon-logging/Chart.yaml | 6 +++--- charts/lagoon-logging/templates/logging.yaml | 4 ++-- charts/lagoon-logging/values.yaml | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml index d6a09344..eca21fea 100644 --- a/charts/lagoon-logging/Chart.yaml +++ b/charts/lagoon-logging/Chart.yaml @@ -32,8 +32,8 @@ dependencies: # Valid supported kinds are added, changed, deprecated, removed, fixed and security annotations: artifacthub.io/changes: | - - kind: changed - description: bump the logging-operator chart dependency to v4.2.3 + - kind: added + description: ability to configure toleration/affinity on FluentD deployment links: - name: Release Notes - url: https://github.com/uselagoon/lagoon-charts/releases/tag/lagoon-logging-0.78.0 + url: https://github.com/uselagoon/lagoon-charts/releases/tag/lagoon-logging-0.79.0 diff --git a/charts/lagoon-logging/templates/logging.yaml b/charts/lagoon-logging/templates/logging.yaml index 3f73dc6a..b5625d75 100644 --- a/charts/lagoon-logging/templates/logging.yaml +++ b/charts/lagoon-logging/templates/logging.yaml @@ -13,11 +13,11 @@ spec: fsGroup: 0 scaling: replicas: {{ .Values.fluentdReplicaCount }} - {{- with .Values.fluentd.affinity }} + {{- with .Values.fluentdAffinity }} affinity: {{- toYaml . | nindent 6 }} {{- end }} - {{- with .Values.fluentd.tolerations }} + {{- with .Values.fluentdTolerations }} tolerations: {{- toYaml . | nindent 6 }} {{- end }} diff --git a/charts/lagoon-logging/values.yaml b/charts/lagoon-logging/values.yaml index 92c689b4..57515c0f 100644 --- a/charts/lagoon-logging/values.yaml +++ b/charts/lagoon-logging/values.yaml @@ -251,10 +251,9 @@ enableDefaultForwarding: true # Set how many fluentd pods should be running fluentdReplicaCount: 3 -fluentd: - tolerations: [] +fluentdTolerations: [] - affinity: {} +fluentdAffinity: {} # Add tolerations to the fluentbit daemonset so that it runs on e.g. # load-balancer nodes. From 6b5787bc7f7ac705fe498256b19adc5323d7b3b2 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 18 Oct 2023 09:14:36 +1100 Subject: [PATCH 4/9] update uselagoon/logs-dispatcher image to v3.4.0 --- charts/lagoon-logging/Chart.yaml | 4 ++-- charts/lagoon-logging/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml index 475b4c4f..b99ff7cd 100644 --- a/charts/lagoon-logging/Chart.yaml +++ b/charts/lagoon-logging/Chart.yaml @@ -19,7 +19,7 @@ type: application # time you make changes to the chart and its templates, including the app # version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.79.0 +version: 0.80.0 dependencies: - name: logging-operator @@ -33,4 +33,4 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: require minimum Kubernetes 1.23 + description: update uselagoon/logs-dispatcher image to v3.4.0 diff --git a/charts/lagoon-logging/values.yaml b/charts/lagoon-logging/values.yaml index 7505be41..ab57d6e3 100644 --- a/charts/lagoon-logging/values.yaml +++ b/charts/lagoon-logging/values.yaml @@ -19,7 +19,7 @@ logsDispatcher: repository: uselagoon/logs-dispatcher pullPolicy: IfNotPresent # Overrides the image tag whose default is "latest". - tag: "v3.3.0" + tag: "v3.4.0" serviceAccount: # Specifies whether a service account should be created @@ -121,7 +121,7 @@ cdnLogsCollector: repository: uselagoon/logs-dispatcher pullPolicy: IfNotPresent # Overrides the image tag whose default is "latest". - tag: "v3.3.0" + tag: "v3.4.0" podAnnotations: {} From f1c0c3b63e3286ffe05065ed2d9d6f7e46bf44ab Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 18 Oct 2023 09:14:49 +1100 Subject: [PATCH 5/9] update uselagoon/logs-concentrator image to v3.2.0 --- charts/lagoon-logs-concentrator/Chart.yaml | 6 ++---- charts/lagoon-logs-concentrator/values.yaml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/charts/lagoon-logs-concentrator/Chart.yaml b/charts/lagoon-logs-concentrator/Chart.yaml index cc6a5f7d..5ceac6a4 100644 --- a/charts/lagoon-logs-concentrator/Chart.yaml +++ b/charts/lagoon-logs-concentrator/Chart.yaml @@ -19,7 +19,7 @@ type: application # time you make changes to the chart and its templates, including the app # version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.46.0 +version: 0.47.0 # This section is used to collect a changelog for artifacthub.io # It should be started afresh for each release @@ -27,6 +27,4 @@ version: 0.46.0 annotations: artifacthub.io/changes: | - kind: changed - description: require minimum Kubernetes 1.23 - - kind: changed - description: removed autoscaling api version helper + description: update uselagoon/logs-concentrator image to v3.2.0 diff --git a/charts/lagoon-logs-concentrator/values.yaml b/charts/lagoon-logs-concentrator/values.yaml index 6d9cff3e..8757ae40 100644 --- a/charts/lagoon-logs-concentrator/values.yaml +++ b/charts/lagoon-logs-concentrator/values.yaml @@ -12,7 +12,7 @@ image: repository: uselagoon/logs-concentrator pullPolicy: IfNotPresent # Overrides the image tag whose default is "latest". - tag: "v3.1.0" + tag: "v3.2.0" imagePullSecrets: [] nameOverride: "" From 43749d43013d08de8ae8e1401e75ed8b603ce426 Mon Sep 17 00:00:00 2001 From: Michael Schmid Date: Mon, 21 Aug 2023 11:08:19 -0400 Subject: [PATCH 6/9] Schedule Logging Pods also on infra nodes --- charts/lagoon-logging/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/lagoon-logging/values.yaml b/charts/lagoon-logging/values.yaml index ab57d6e3..5307b505 100644 --- a/charts/lagoon-logging/values.yaml +++ b/charts/lagoon-logging/values.yaml @@ -260,6 +260,9 @@ fluentbitTolerations: - effect: NoSchedule key: lagoon.sh/spot operator: Exists +- effect: NoSchedule + key: lagoon.sh/infra + operator: Exists # Expose metrics of the Logging Operator's fluentbit daemonset and fluentd # statefulset via a Prometheus Operator compatible ServiceMonitor object. From 8166ee9224de4130e560f4d85791a841928394db Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 18 Oct 2023 09:16:54 +1100 Subject: [PATCH 7/9] update ah anno --- charts/lagoon-logging/Chart.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml index b99ff7cd..b6a5e529 100644 --- a/charts/lagoon-logging/Chart.yaml +++ b/charts/lagoon-logging/Chart.yaml @@ -34,3 +34,5 @@ annotations: artifacthub.io/changes: | - kind: changed description: update uselagoon/logs-dispatcher image to v3.4.0 + - kind: added + description: schedule Logging Pods also on infra nodes From 8f033b6de5d60973e012a229711ef99e6957fd4e Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 18 Oct 2023 09:59:53 +1100 Subject: [PATCH 8/9] fix whitespace --- charts/lagoon-logging/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml index c62005ff..e218bd32 100644 --- a/charts/lagoon-logging/Chart.yaml +++ b/charts/lagoon-logging/Chart.yaml @@ -37,4 +37,4 @@ annotations: - kind: added description: schedule Logging Pods also on infra nodes - kind: added - description: ability to configure toleration/affinity on FluentD deployment + description: ability to configure toleration/affinity on FluentD deployment From ecc3220a6a31042e155f190f65c6de6fd019b179 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 20 Oct 2023 12:08:27 +1100 Subject: [PATCH 9/9] Update values.yaml docco for tolerations/affinity --- charts/lagoon-logging/values.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/charts/lagoon-logging/values.yaml b/charts/lagoon-logging/values.yaml index 7f7b8621..6616f1c0 100644 --- a/charts/lagoon-logging/values.yaml +++ b/charts/lagoon-logging/values.yaml @@ -248,15 +248,16 @@ consolidateServiceIndices: false # sent to a third-party service and not to a central elasticsearch. enableDefaultForwarding: true -# Set how many fluentd pods should be running +# Set how many Fluentd log forwarder pods should be running fluentdReplicaCount: 3 +# Add tolerations and affinity to the Fluentd log forwarder statefulset to +# better control where it runs e.g. avoiding spot or load-balancers fluentdTolerations: [] - fluentdAffinity: {} -# Add tolerations to the fluentbit daemonset so that it runs on e.g. -# load-balancer nodes. +# Add tolerations to the Fluent Bit log collector daemonset to define where it +# runs on to collect data e.g. load-balancer or infra nodes. fluentbitTolerations: - effect: NoSchedule key: lagoon.sh/lb