Skip to content

Commit 4435f21

Browse files
authored
Merge pull request #204 from kube-logging/updates-for-4.5
Doc sync and source fixes for 4.5
2 parents 70fc772 + eab7cef commit 4435f21

File tree

99 files changed

+4417
-4712
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+4417
-4712
lines changed
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: Publish version 4.4
2+
3+
env:
4+
doc_versionnumber: "4.4"
5+
6+
on:
7+
push:
8+
branches:
9+
- release-4.4
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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
33+
with:
34+
ref: release-4.4
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@16361eb4acea8698b220b76c0d4e84e1fd22c61d # v2.6.0
43+
with:
44+
hugo-version: '0.110.0'
45+
extended: true
46+
47+
- name: Set up Node
48+
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
49+
with:
50+
node-version: 16
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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
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'

.htmltest.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
DirectoryPath: public/docs/install
2+
CheckDoctype: false # Sadly, this is false only because of `static/google*.html`
3+
IgnoreAltMissing: true # FIXME
4+
IgnoreDirectoryMissingTrailingSlash: true # FIXME
5+
IgnoreDirs: [_print] # FIXME
6+
IgnoreEmptyHref: true # FIXME
7+
IgnoreInternalEmptyHash: true # FIXME
8+
IgnoreURLs: [http://localhost, https://https://github.com/kube-logging/kube-logging.github.io/new/*, _print/]

config/_default/config.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ twitter = "calisti12"
6969
# Used in the "version-banner" partial to display a version number for the
7070
# current doc set.
7171

72-
version = "4.4.0"
72+
version = "4.5.0"
7373
version_menu = "Releases"
7474
version_menu_canonicallinks = true
7575
version_menu_pagelinks = true
@@ -169,9 +169,13 @@ twitter = "calisti12"
169169
#######################
170170
# Add your release versions here
171171
[[params.versions]]
172-
version = "latest (4.4.0)"
172+
version = "latest (4.5.0)"
173173
githubbranch = "master"
174174
url = ""
175+
[[params.versions]]
176+
version = "4.4"
177+
githubbranch = "release-4.4"
178+
url = "/4.4/"
175179
[[params.versions]]
176180
version = "4.3"
177181
githubbranch = "release-4.3"
@@ -188,7 +192,7 @@ twitter = "calisti12"
188192
# Cascade version number to every doc page (needed to create sections for pagefind search)
189193
# Update this parameter when creating a new version
190194
[[cascade]]
191-
body_attribute = 'data-pagefind-filter="section:4.4"'
195+
body_attribute = 'data-pagefind-filter="section:4.5"'
192196
[cascade._target]
193197
path = '/docs/**'
194198

content/docs/configuration/crds/extensions/eventtailer_types.md

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,35 @@ generated_file: true
88

99
EventTailerSpec defines the desired state of EventTailer
1010

11+
### containerOverrides (*types.ContainerBase, optional) {#eventtailerspec-containeroverrides}
12+
13+
Override container fields for the given statefulset
14+
15+
1116
### controlNamespace (string, required) {#eventtailerspec-controlnamespace}
1217

1318
The resources of EventTailer will be placed into this namespace
1419

15-
Default: -
1620

17-
### positionVolume (volume.KubernetesVolume, optional) {#eventtailerspec-positionvolume}
21+
### image (*tailer.ImageSpec, optional) {#eventtailerspec-image}
1822

19-
Volume definition for tracking fluentbit file positions (optional)
23+
Override image related fields for the given statefulset, highest precedence
2024

21-
Default: -
2225

23-
### workloadMetaOverrides (*types.MetaBase, optional) {#eventtailerspec-workloadmetaoverrides}
26+
### positionVolume (volume.KubernetesVolume, optional) {#eventtailerspec-positionvolume}
2427

25-
Override metadata of the created resources
28+
Volume definition for tracking fluentbit file positions (optional)
2629

27-
Default: -
2830

2931
### workloadOverrides (*types.PodSpecBase, optional) {#eventtailerspec-workloadoverrides}
3032

3133
Override podSpec fields for the given statefulset
3234

33-
Default: -
34-
35-
### containerOverrides (*types.ContainerBase, optional) {#eventtailerspec-containeroverrides}
36-
37-
Override container fields for the given statefulset
3835

39-
Default: -
40-
41-
### image (*tailer.ImageSpec, optional) {#eventtailerspec-image}
36+
### workloadMetaOverrides (*types.MetaBase, optional) {#eventtailerspec-workloadmetaoverrides}
4237

43-
Override image related fields for the given statefulset, highest precedence
38+
Override metadata of the created resources
4439

45-
Default: -
4640

4741

4842
## EventTailerStatus
@@ -56,19 +50,15 @@ EventTailer is the Schema for the eventtailers API
5650

5751
### (metav1.TypeMeta, required) {#eventtailer-}
5852

59-
Default: -
6053

6154
### metadata (metav1.ObjectMeta, optional) {#eventtailer-metadata}
6255

63-
Default: -
6456

6557
### spec (EventTailerSpec, optional) {#eventtailer-spec}
6658

67-
Default: -
6859

6960
### status (EventTailerStatus, optional) {#eventtailer-status}
7061

71-
Default: -
7262

7363

7464
## EventTailerList
@@ -77,14 +67,11 @@ EventTailerList contains a list of EventTailer
7767

7868
### (metav1.TypeMeta, required) {#eventtailerlist-}
7969

80-
Default: -
8170

8271
### metadata (metav1.ListMeta, optional) {#eventtailerlist-metadata}
8372

84-
Default: -
8573

8674
### items ([]EventTailer, required) {#eventtailerlist-items}
8775

88-
Default: -
8976

9077

0 commit comments

Comments
 (0)