From b0c941a2715f9fe1ebd3cf82b878d76916b0bf7b Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Thu, 13 Mar 2025 16:22:06 +0100 Subject: [PATCH 01/10] Version number bump --- config/_default/config.toml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/_default/config.toml b/config/_default/config.toml index 71cdc3e85..b84125ecd 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -65,7 +65,7 @@ weight = 1 # Used in the "version-banner" partial to display a version number for the # current doc set. - version = "5.1" + version = "5.2" version_menu = "Releases" version_menu_canonicallinks = true version_menu_pagelinks = true @@ -169,9 +169,13 @@ twitter = "AxoflowIO" ####################### # Add your release versions here [[params.versions]] - version = "latest (5.1)" + version = "latest (5.2)" githubbranch = "master" url = "" +[[params.versions]] + version = "5.1" + githubbranch = "release-5.1" + url = "/5.1/" [[params.versions]] version = "5.0" githubbranch = "release-5.0" From 1ca7457c2dac6e75df838964ca49c5b65d2aa7c2 Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Thu, 13 Mar 2025 16:22:19 +0100 Subject: [PATCH 02/10] Image versions update --- content/docs/image-versions.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/content/docs/image-versions.md b/content/docs/image-versions.md index d13dc5d61..ea71e8401 100644 --- a/content/docs/image-versions.md +++ b/content/docs/image-versions.md @@ -5,6 +5,22 @@ weight: 750 Logging operator uses the following image versions. +## Logging operator version 5.2 + +| Image repository | GitHub repository | Version | +| -------- | --- | -- | +| ghcr.io/kube-logging/node-exporter | https://github.com/kube-logging/node-exporter-image | v0.10.0 | +| ghcr.io/kube-logging/config-reloader | https://github.com/kube-logging/config-reloader | 5.2.0 | +| ghcr.io/kube-logging/fluentd-drain-watch | https://github.com/kube-logging/fluentd-drain-watch | v0.2.4 | +| k8s.gcr.io/pause | | 3.9 | +| docker.io/busybox | https://github.com/docker-library/busybox | latest | +| ghcr.io/axoflow/axosyslog | https://github.com/axoflow/axosyslog/ | 4.9.0 | +| docker.io/fluent/fluent-bit | https://github.com/fluent/fluent-bit | 3.2.5 | +| ghcr.io/kube-logging/logging-operator/fluentd | ghcr.io/kube-logging/logging-operator/fluentd | 5.2.0-full | +| ghcr.io/axoflow/axosyslog-metrics-exporter | https://github.com/axoflow/axosyslog-metrics-exporter | 0.0.9 | +| ghcr.io/kube-logging/syslogng-reload | https://github.com/kube-logging/syslogng-reload-image | 5.2.0 | +| ghcr.io/kube-logging/eventrouter | https://github.com/kube-logging/eventrouter | 0.4.0 | + ## Logging operator version 5.1 | Image repository | GitHub repository | Version | From bef931499eedde94945ee7289123c35eea6f5e2e Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Thu, 13 Mar 2025 16:22:41 +0100 Subject: [PATCH 03/10] Adds Workflow file --- .github/workflows/publish-version-5.2.yaml | 86 ++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 .github/workflows/publish-version-5.2.yaml diff --git a/.github/workflows/publish-version-5.2.yaml b/.github/workflows/publish-version-5.2.yaml new file mode 100644 index 000000000..05c1780c7 --- /dev/null +++ b/.github/workflows/publish-version-5.2.yaml @@ -0,0 +1,86 @@ +name: Publish version 5.2 + +env: + doc_versionnumber: "5.2" + +on: + push: + branches: + - release-5.2 + workflow_dispatch: + +jobs: + build: + name: Build + runs-on: ubuntu-latest + + permissions: + contents: write + pages: write + id-token: write + + concurrency: + group: "pages" + cancel-in-progress: false + + environment: + name: github-pages-test + url: ${{ steps.deployment.outputs.page_url }} + + steps: + - name: Checkout code + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: release-5.2 + submodules: 'recursive' + + - name: Set up Pages + id: pages + uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4.0.0 + + - name: Set up Hugo + uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0 + with: + hugo-version: '0.110.0' + extended: true + + - name: Set up Node + uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 + with: + node-version: 18 + + - name: Install dependencies + run: | + cd themes/docsy + npm install + + - name: Set up PostCSS + run: npm install --save-dev autoprefixer postcss-cli postcss + + - name: Build + run: hugo --environment production --baseURL ${{ steps.pages.outputs.base_url }}/${{ env.doc_versionnumber }}/ + + # - name: Upload artifact + # uses: actions/upload-pages-artifact@64bcae551a7b18bcb9a09042ddf1960979799187 # v1.0.8 + # with: + # path: ./public/ + + - name: Checkout code to update + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: 'gh-pages-test' + path: 'tmp/gh-pages' + # - name: Display file structure + # run: ls -R + - name: Copy built site to GH pages + run: | + rm -rf tmp/gh-pages/${{ env.doc_versionnumber }} + mkdir -p tmp/gh-pages/${{ env.doc_versionnumber }} + mv public/* tmp/gh-pages/${{ env.doc_versionnumber }} + - name: Commit & Push changes + uses: actions-js/push@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + message: 'Publish updated docs for ${{ env.doc_versionnumber }}, ${{ github.event.repository.pushed_at}}' + branch: 'gh-pages-test' + directory: 'tmp/gh-pages' From 75e31f87a9a375e59ffce261bda631fcd499bc87 Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Thu, 13 Mar 2025 16:45:58 +0100 Subject: [PATCH 04/10] Whatsnew draft --- content/docs/whats-new/_index.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/content/docs/whats-new/_index.md b/content/docs/whats-new/_index.md index f511da7d4..5ada66fcc 100644 --- a/content/docs/whats-new/_index.md +++ b/content/docs/whats-new/_index.md @@ -3,6 +3,13 @@ title: What's new weight: 50 --- +## Version 5.2 + +The following are the highlights and main changes of Logging operator 5.2. For a complete list of changes and bugfixes, see the [Logging operator 5.2 releases page](https://github.com/kube-logging/logging-operator/releases/tag/5.2.0). + +You can now disable mounting the `/var/lib/docker/containers` volume using the `DisableVarLibDockerContainers` option in the `loggings` or `FluentbitAgent` CRD. This solves an installation error on GKE Autopilot. + + ## Version 5.1 The following are the highlights and main changes of Logging operator 5.1. For a complete list of changes and bugfixes, see the [Logging operator 5.1 releases page](https://github.com/kube-logging/logging-operator/releases/tag/5.1.1). From 00243dcc09127d5ec2067d65731f11377179b0b9 Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Thu, 13 Mar 2025 16:46:12 +0100 Subject: [PATCH 05/10] Updates fluentbit_types --- content/docs/configuration/crds/v1beta1/fluentbit_types.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/content/docs/configuration/crds/v1beta1/fluentbit_types.md b/content/docs/configuration/crds/v1beta1/fluentbit_types.md index b1824379f..28188e664 100644 --- a/content/docs/configuration/crds/v1beta1/fluentbit_types.md +++ b/content/docs/configuration/crds/v1beta1/fluentbit_types.md @@ -125,6 +125,11 @@ spec: Disable Kubernetes metadata filter +### disableVarLibDockerContainers (*bool, optional) {#fluentbitspec-disablevarlibdockercontainers} + +DisableVarLibDockerContainers controls whether the /var/lib/docker/containers volume is mounted. If true, the volume is NOT mounted. If false (default), the volume is mounted. + + ### enableUpstream (bool, optional) {#fluentbitspec-enableupstream} From 0a846abc88055c6eb8cf2ff1ab5e07dd3652b70d Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Fri, 14 Mar 2025 12:14:56 +0100 Subject: [PATCH 06/10] Update content/docs/image-versions.md Co-authored-by: Bence Csati <113284287+csatib02@users.noreply.github.com> Signed-off-by: Robert Fekete --- content/docs/image-versions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/image-versions.md b/content/docs/image-versions.md index ea71e8401..818746709 100644 --- a/content/docs/image-versions.md +++ b/content/docs/image-versions.md @@ -14,7 +14,7 @@ Logging operator uses the following image versions. | ghcr.io/kube-logging/fluentd-drain-watch | https://github.com/kube-logging/fluentd-drain-watch | v0.2.4 | | k8s.gcr.io/pause | | 3.9 | | docker.io/busybox | https://github.com/docker-library/busybox | latest | -| ghcr.io/axoflow/axosyslog | https://github.com/axoflow/axosyslog/ | 4.9.0 | +| ghcr.io/axoflow/axosyslog | https://github.com/axoflow/axosyslog/ | 4.10.1 | | docker.io/fluent/fluent-bit | https://github.com/fluent/fluent-bit | 3.2.5 | | ghcr.io/kube-logging/logging-operator/fluentd | ghcr.io/kube-logging/logging-operator/fluentd | 5.2.0-full | | ghcr.io/axoflow/axosyslog-metrics-exporter | https://github.com/axoflow/axosyslog-metrics-exporter | 0.0.9 | From 96edc20a10447f812f1642a15b3269606539ec5b Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Fri, 14 Mar 2025 12:15:03 +0100 Subject: [PATCH 07/10] Update content/docs/image-versions.md Co-authored-by: Bence Csati <113284287+csatib02@users.noreply.github.com> Signed-off-by: Robert Fekete --- content/docs/image-versions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/image-versions.md b/content/docs/image-versions.md index 818746709..de0d078e7 100644 --- a/content/docs/image-versions.md +++ b/content/docs/image-versions.md @@ -10,7 +10,7 @@ Logging operator uses the following image versions. | Image repository | GitHub repository | Version | | -------- | --- | -- | | ghcr.io/kube-logging/node-exporter | https://github.com/kube-logging/node-exporter-image | v0.10.0 | -| ghcr.io/kube-logging/config-reloader | https://github.com/kube-logging/config-reloader | 5.2.0 | +| ghcr.io/kube-logging/logging-operator/config-reloader | https://github.com/kube-logging/logging-operator/tree/master/images/config-reloader | 5.2.0 | | ghcr.io/kube-logging/fluentd-drain-watch | https://github.com/kube-logging/fluentd-drain-watch | v0.2.4 | | k8s.gcr.io/pause | | 3.9 | | docker.io/busybox | https://github.com/docker-library/busybox | latest | From 584080e92ec606dbc57f31bdfbd589d2572b943f Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Fri, 14 Mar 2025 12:15:16 +0100 Subject: [PATCH 08/10] Update content/docs/image-versions.md Co-authored-by: Bence Csati <113284287+csatib02@users.noreply.github.com> Signed-off-by: Robert Fekete --- content/docs/image-versions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/image-versions.md b/content/docs/image-versions.md index de0d078e7..1a48a689e 100644 --- a/content/docs/image-versions.md +++ b/content/docs/image-versions.md @@ -16,7 +16,7 @@ Logging operator uses the following image versions. | docker.io/busybox | https://github.com/docker-library/busybox | latest | | ghcr.io/axoflow/axosyslog | https://github.com/axoflow/axosyslog/ | 4.10.1 | | docker.io/fluent/fluent-bit | https://github.com/fluent/fluent-bit | 3.2.5 | -| ghcr.io/kube-logging/logging-operator/fluentd | ghcr.io/kube-logging/logging-operator/fluentd | 5.2.0-full | +| ghcr.io/kube-logging/logging-operator/fluentd | https://github.com/kube-logging/logging-operator/tree/master/images/fluentd | 5.2.0-full | | ghcr.io/axoflow/axosyslog-metrics-exporter | https://github.com/axoflow/axosyslog-metrics-exporter | 0.0.9 | | ghcr.io/kube-logging/syslogng-reload | https://github.com/kube-logging/syslogng-reload-image | 5.2.0 | | ghcr.io/kube-logging/eventrouter | https://github.com/kube-logging/eventrouter | 0.4.0 | From 1ba1dbf04a0d0b77f39afffd11458a339603d173 Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Fri, 14 Mar 2025 12:15:33 +0100 Subject: [PATCH 09/10] Update content/docs/image-versions.md Co-authored-by: Bence Csati <113284287+csatib02@users.noreply.github.com> Signed-off-by: Robert Fekete --- content/docs/image-versions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/image-versions.md b/content/docs/image-versions.md index 1a48a689e..90c225c34 100644 --- a/content/docs/image-versions.md +++ b/content/docs/image-versions.md @@ -18,7 +18,7 @@ Logging operator uses the following image versions. | docker.io/fluent/fluent-bit | https://github.com/fluent/fluent-bit | 3.2.5 | | ghcr.io/kube-logging/logging-operator/fluentd | https://github.com/kube-logging/logging-operator/tree/master/images/fluentd | 5.2.0-full | | ghcr.io/axoflow/axosyslog-metrics-exporter | https://github.com/axoflow/axosyslog-metrics-exporter | 0.0.9 | -| ghcr.io/kube-logging/syslogng-reload | https://github.com/kube-logging/syslogng-reload-image | 5.2.0 | +| ghcr.io/kube-logging/logging-operator/syslog-ng-reloader | https://github.com/kube-logging/logging-operator/tree/master/images/syslog-ng-reloader | 5.2.0 | | ghcr.io/kube-logging/eventrouter | https://github.com/kube-logging/eventrouter | 0.4.0 | ## Logging operator version 5.1 From 2484762d3f70a7d224e6996ab3fd89cacf8e7934 Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Fri, 14 Mar 2025 12:23:33 +0100 Subject: [PATCH 10/10] Review fixes --- content/docs/whats-new/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/docs/whats-new/_index.md b/content/docs/whats-new/_index.md index 5ada66fcc..cc35727d8 100644 --- a/content/docs/whats-new/_index.md +++ b/content/docs/whats-new/_index.md @@ -9,6 +9,7 @@ The following are the highlights and main changes of Logging operator 5.2. For a You can now disable mounting the `/var/lib/docker/containers` volume using the `DisableVarLibDockerContainers` option in the `loggings` or `FluentbitAgent` CRD. This solves an installation error on GKE Autopilot. +In this release we've moved `config-reloader` and `syslog-ng-reloader` into the Logging operator repository. From now on, we build these images from our repository (https://github.com/kube-logging/logging-operator/tree/master/images/) and their version numbering follows the version numbers of Logging operator. ## Version 5.1