From 70e72f3f7cae7c0e1cda0372568d049e728ee39c Mon Sep 17 00:00:00 2001 From: Scott Leggett Date: Fri, 2 Jun 2023 13:50:33 +0800 Subject: [PATCH 1/4] feat: bump the logging-operator chart dependency to v4.2.3 --- charts/lagoon-logging/Chart.lock | 8 ++++---- charts/lagoon-logging/Chart.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/lagoon-logging/Chart.lock b/charts/lagoon-logging/Chart.lock index 8dcc8f15..ffda22ac 100644 --- a/charts/lagoon-logging/Chart.lock +++ b/charts/lagoon-logging/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: logging-operator - repository: https://kubernetes-charts.banzaicloud.com - version: 3.17.10 -digest: sha256:293ac5ba13713b7edcc8fb655e8fd402c6d466c57edcdc9886f1336b39815b8c -generated: "2022-11-28T22:12:54.57492083+08:00" + repository: https://kube-logging.github.io/helm-charts + version: 4.2.3 +digest: sha256:bcfec23e091d887e7892f70bddbcf33a09195e4140372028b25f8e16cf54436f +generated: "2023-06-14T14:13:35.857841045+08:00" diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml index b8133717..025f5140 100644 --- a/charts/lagoon-logging/Chart.yaml +++ b/charts/lagoon-logging/Chart.yaml @@ -23,8 +23,8 @@ version: 0.77.0 dependencies: - name: logging-operator - repository: https://kubernetes-charts.banzaicloud.com - version: ~3.17.0 + repository: https://kube-logging.github.io/helm-charts + version: ~4.2.0 condition: logging-operator.enabled # This section is used to collect a changelog for artifacthub.io From 3ed69bcdb01d9c4d80f813121017f1ff89ecc71f Mon Sep 17 00:00:00 2001 From: Scott Leggett Date: Fri, 2 Jun 2023 13:51:49 +0800 Subject: [PATCH 2/4] chore: bump lagoon-logging chart version --- charts/lagoon-logging/Chart.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml index 025f5140..76cd9361 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.77.0 +version: 0.78.0 dependencies: - name: logging-operator @@ -32,5 +32,8 @@ dependencies: # Valid supported kinds are added, changed, deprecated, removed, fixed and security annotations: artifacthub.io/changes: | - - kind: added - description: add chart option to configure logging-operator subchart metrics, and enable the fluentbit ServiceMonitor by default + - kind: changed + description: bump the logging-operator chart dependency to v4.2.3 + links: + - name: Release Notes + url: https://github.com/uselagoon/lagoon-charts/releases/tag/lagoon-logging-0.78.0 From 9b64d8fc98c85e62fada9ee3adff70ec075361c9 Mon Sep 17 00:00:00 2001 From: Scott Leggett Date: Fri, 2 Jun 2023 14:26:16 +0800 Subject: [PATCH 3/4] chore: add helm chart repository to chart-testing configuration kube-logging has moved to a new repository. --- .github/workflows/lint-test.yaml | 1 + .github/workflows/release.yaml | 1 + default.ct.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 7e494a9a..3d23604e 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -21,6 +21,7 @@ jobs: helm repo add amazeeio https://amazeeio.github.io/charts/ helm repo add gatekeeper https://open-policy-agent.github.io/gatekeeper/charts helm repo add nats https://nats-io.github.io/k8s/helm/charts/ + helm repo add kube-logging https://kube-logging.github.io/helm-charts - name: Generate helm templates run: | cd charts diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 377367a3..6f01c05a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,6 +33,7 @@ jobs: helm repo add amazeeio https://amazeeio.github.io/charts/ helm repo add gatekeeper https://open-policy-agent.github.io/gatekeeper/charts helm repo add nats https://nats-io.github.io/k8s/helm/charts/ + helm repo add kube-logging https://kube-logging.github.io/helm-charts - name: Run chart-releaser uses: helm/chart-releaser-action@v1.5.0 diff --git a/default.ct.yaml b/default.ct.yaml index b97c6540..a00f6d8f 100644 --- a/default.ct.yaml +++ b/default.ct.yaml @@ -10,6 +10,7 @@ chart-repos: - amazeeio=https://amazeeio.github.io/charts/ - gatekeeper=https://open-policy-agent.github.io/gatekeeper/charts - nats=https://nats-io.github.io/k8s/helm/charts/ +- kube-logging=https://kube-logging.github.io/helm-charts excluded-charts: - lagoon-test - lagoon-gatekeeper From ae7c7d0f6b45d5d830c82c3974c10fcb08035091 Mon Sep 17 00:00:00 2001 From: Scott Leggett Date: Fri, 9 Jun 2023 10:12:00 +0800 Subject: [PATCH 4/4] fix: ensure that workloads are updated on logging-operator upgrade This flag causes e.g. daemonsets and statefulsets to be forcefully deleted and recreated if required for a configuration change. Unfortunately this can mean transient data loss (e.g. data in buffers), but that seems to be a reasonable tradeoff. --- charts/lagoon-logging/templates/logging.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/lagoon-logging/templates/logging.yaml b/charts/lagoon-logging/templates/logging.yaml index 3393d950..a037df96 100644 --- a/charts/lagoon-logging/templates/logging.yaml +++ b/charts/lagoon-logging/templates/logging.yaml @@ -5,6 +5,7 @@ metadata: labels: {{- include "lagoon-logging.labels" . | nindent 4 }} spec: + enableRecreateWorkloadOnImmutableFieldChange: true fluentd: security: podSecurityContext: