Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Logging updates #620

Merged
merged 11 commits into from
Oct 20, 2023
Merged

Logging updates #620

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
233f51d
Ability to configure affinity/tolerations on FluentD
FleetAdmiralButter Jun 22, 2023
64782fa
Bump lagoon-logging to 0.79.0
FleetAdmiralButter Jun 22, 2023
3cb44a4
Unnest affinity/toleration and update changelog
FleetAdmiralButter Jun 22, 2023
6b5787b
update uselagoon/logs-dispatcher image to v3.4.0
tobybellwood Oct 17, 2023
f1c0c3b
update uselagoon/logs-concentrator image to v3.2.0
tobybellwood Oct 17, 2023
43749d4
Schedule Logging Pods also on infra nodes
Schnitzel Aug 21, 2023
8166ee9
update ah anno
tobybellwood Oct 17, 2023
36147ea
Merge branch 'logging_updates' into main
tobybellwood Oct 17, 2023
ba72e0e
Merge pull request #590 from FleetAdmiralButter/main
tobybellwood Oct 17, 2023
8f033b6
fix whitespace
tobybellwood Oct 17, 2023
ecc3220
Update values.yaml docco for tolerations/affinity
tobybellwood Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions charts/lagoon-logging/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -33,4 +33,8 @@ dependencies:
annotations:
artifacthub.io/changes: |
- kind: changed
description: require minimum Kubernetes 1.23
description: update uselagoon/logs-dispatcher image to v3.4.0
- kind: added
description: schedule Logging Pods also on infra nodes
- kind: added
description: ability to configure toleration/affinity on FluentD deployment
8 changes: 8 additions & 0 deletions charts/lagoon-logging/templates/logging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ spec:
fsGroup: 0
scaling:
replicas: {{ .Values.fluentdReplicaCount }}
{{- with .Values.fluentdAffinity }}
affinity:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.fluentdTolerations }}
tolerations:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.fluentdMetrics }}
metrics:
{{- toYaml . | nindent 6 }}
Expand Down
11 changes: 9 additions & 2 deletions charts/lagoon-logging/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: {}

Expand Down Expand Up @@ -251,6 +251,10 @@ enableDefaultForwarding: true
# Set how many fluentd pods should be running
fluentdReplicaCount: 3

fluentdTolerations: []
tobybellwood marked this conversation as resolved.
Show resolved Hide resolved

fluentdAffinity: {}

# Add tolerations to the fluentbit daemonset so that it runs on e.g.
# load-balancer nodes.
fluentbitTolerations:
Expand All @@ -260,6 +264,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.
Expand Down
6 changes: 2 additions & 4 deletions charts/lagoon-logs-concentrator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@ 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
# Valid supported kinds are added, changed, deprecated, removed, fixed and security
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
2 changes: 1 addition & 1 deletion charts/lagoon-logs-concentrator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
Loading