Skip to content

Commit 1bf3a35

Browse files
fekete-robertfekete-robert
authored
Merge pull request #280 from kube-logging/5.2-updates
5.2 updates
2 parents e25e1fb + 2484762 commit 1bf3a35

File tree

5 files changed

+121
-2
lines changed

5 files changed

+121
-2
lines changed

‎.github/workflows/publish-version-5.2.yaml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: Publish version 5.2
2+
3+
env:
4+
doc_versionnumber: "5.2"
5+
6+
on:
7+
push:
8+
branches:
9+
- release-5.2
10+
workflow_dispatch:
11+
12+
jobs:
13+
build:
14+
name: Build
15+
runs-on: ubuntu-latest
16+
17+
permissions:
18+
contents: write
19+
pages: write
20+
id-token: write
21+
22+
concurrency:
23+
group: "pages"
24+
cancel-in-progress: false
25+
26+
environment:
27+
name: github-pages-test
28+
url: ${{ steps.deployment.outputs.page_url }}
29+
30+
steps:
31+
- name: Checkout code
32+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
with:
34+
ref: release-5.2
35+
submodules: 'recursive'
36+
37+
- name: Set up Pages
38+
id: pages
39+
uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4.0.0
40+
41+
- name: Set up Hugo
42+
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
43+
with:
44+
hugo-version: '0.110.0'
45+
extended: true
46+
47+
- name: Set up Node
48+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
49+
with:
50+
node-version: 18
51+
52+
- name: Install dependencies
53+
run: |
54+
cd themes/docsy
55+
npm install
56+
57+
- name: Set up PostCSS
58+
run: npm install --save-dev autoprefixer postcss-cli postcss
59+
60+
- name: Build
61+
run: hugo --environment production --baseURL ${{ steps.pages.outputs.base_url }}/${{ env.doc_versionnumber }}/
62+
63+
# - name: Upload artifact
64+
# uses: actions/upload-pages-artifact@64bcae551a7b18bcb9a09042ddf1960979799187 # v1.0.8
65+
# with:
66+
# path: ./public/
67+
68+
- name: Checkout code to update
69+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
70+
with:
71+
ref: 'gh-pages-test'
72+
path: 'tmp/gh-pages'
73+
# - name: Display file structure
74+
# run: ls -R
75+
- name: Copy built site to GH pages
76+
run: |
77+
rm -rf tmp/gh-pages/${{ env.doc_versionnumber }}
78+
mkdir -p tmp/gh-pages/${{ env.doc_versionnumber }}
79+
mv public/* tmp/gh-pages/${{ env.doc_versionnumber }}
80+
- name: Commit & Push changes
81+
uses: actions-js/push@master
82+
with:
83+
github_token: ${{ secrets.GITHUB_TOKEN }}
84+
message: 'Publish updated docs for ${{ env.doc_versionnumber }}, ${{ github.event.repository.pushed_at}}'
85+
branch: 'gh-pages-test'
86+
directory: 'tmp/gh-pages'

‎config/_default/config.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ weight = 1
6565
# Used in the "version-banner" partial to display a version number for the
6666
# current doc set.
6767

68-
version = "5.1"
68+
version = "5.2"
6969
version_menu = "Releases"
7070
version_menu_canonicallinks = true
7171
version_menu_pagelinks = true
@@ -169,9 +169,13 @@ twitter = "AxoflowIO"
169169
#######################
170170
# Add your release versions here
171171
[[params.versions]]
172-
version = "latest (5.1)"
172+
version = "latest (5.2)"
173173
githubbranch = "master"
174174
url = ""
175+
[[params.versions]]
176+
version = "5.1"
177+
githubbranch = "release-5.1"
178+
url = "/5.1/"
175179
[[params.versions]]
176180
version = "5.0"
177181
githubbranch = "release-5.0"

‎content/docs/configuration/crds/v1beta1/fluentbit_types.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ spec:
125125
Disable Kubernetes metadata filter
126126
127127
128+
### disableVarLibDockerContainers (*bool, optional) {#fluentbitspec-disablevarlibdockercontainers}
129+
130+
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.
131+
132+
128133
### enableUpstream (bool, optional) {#fluentbitspec-enableupstream}
129134
130135

‎content/docs/image-versions.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@ weight: 750
55

66
Logging operator uses the following image versions.
77

8+
## Logging operator version 5.2
9+
10+
| Image repository | GitHub repository | Version |
11+
| -------- | --- | -- |
12+
| ghcr.io/kube-logging/node-exporter | https://github.com/kube-logging/node-exporter-image | v0.10.0 |
13+
| ghcr.io/kube-logging/logging-operator/config-reloader | https://github.com/kube-logging/logging-operator/tree/master/images/config-reloader | 5.2.0 |
14+
| ghcr.io/kube-logging/fluentd-drain-watch | https://github.com/kube-logging/fluentd-drain-watch | v0.2.4 |
15+
| k8s.gcr.io/pause | | 3.9 |
16+
| docker.io/busybox | https://github.com/docker-library/busybox | latest |
17+
| ghcr.io/axoflow/axosyslog | https://github.com/axoflow/axosyslog/ | 4.10.1 |
18+
| docker.io/fluent/fluent-bit | https://github.com/fluent/fluent-bit | 3.2.5 |
19+
| ghcr.io/kube-logging/logging-operator/fluentd | https://github.com/kube-logging/logging-operator/tree/master/images/fluentd | 5.2.0-full |
20+
| ghcr.io/axoflow/axosyslog-metrics-exporter | https://github.com/axoflow/axosyslog-metrics-exporter | 0.0.9 |
21+
| 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 |
22+
| ghcr.io/kube-logging/eventrouter | https://github.com/kube-logging/eventrouter | 0.4.0 |
23+
824
## Logging operator version 5.1
925

1026
| Image repository | GitHub repository | Version |

‎content/docs/whats-new/_index.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ title: What's new
33
weight: 50
44
---
55

6+
## Version 5.2
7+
8+
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).
9+
10+
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.
11+
12+
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.
13+
614
## Version 5.1
715

816
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).

0 commit comments

Comments
 (0)