Skip to content

Commit e0738a9

Browse files
Hector MonsalveUnix4ever
authored andcommitted
fix: set pod name in k8s kube-system log filenames
Set k8s log files names to contain the pod name instead of the pod's container name. Signed-off-by: Hector Monsalve <hmonsalv@gmail.com>
1 parent 0f784bd commit e0738a9

File tree

14 files changed

+411
-184
lines changed

14 files changed

+411
-184
lines changed

.dockerignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-03-12T18:30:08Z by kres latest.
3+
# Generated on 2025-11-03T14:52:39Z by kres cd5a938.
44

55
*
66
!support
@@ -9,3 +9,4 @@
99
!.golangci.yml
1010
!README.md
1111
!.markdownlint.json
12+
!hack/govulncheck.sh

.github/renovate.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@
1818
"pin",
1919
"digest"
2020
]
21+
},
22+
{
23+
"enabled": false,
24+
"matchFileNames": [
25+
"Dockerfile"
26+
]
27+
},
28+
{
29+
"enabled": false,
30+
"matchFileNames": [
31+
".github/workflows/*.yaml"
32+
]
2133
}
2234
],
2335
"separateMajorMinor": false

.github/workflows/ci.yaml

Lines changed: 107 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-12-25T15:05:54Z by kres fcff05e.
3+
# Generated on 2025-11-03T14:52:39Z by kres cd5a938.
44

5-
name: default
65
concurrency:
76
group: ${{ github.head_ref || github.run_id }}
87
cancel-in-progress: true
@@ -17,6 +16,7 @@ concurrency:
1716
branches:
1817
- main
1918
- release-*
19+
name: default
2020
jobs:
2121
default:
2222
permissions:
@@ -26,13 +26,12 @@ jobs:
2626
packages: write
2727
pull-requests: read
2828
runs-on:
29-
- self-hosted
30-
- generic
29+
group: generic
3130
if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/'))
3231
steps:
3332
- name: gather-system-info
3433
id: system-info
35-
uses: kenchan0130/actions-system-info@v1.3.0
34+
uses: kenchan0130/actions-system-info@v1.4.0
3635
continue-on-error: true
3736
- name: print-system-info
3837
run: |
@@ -56,7 +55,7 @@ jobs:
5655
done
5756
continue-on-error: true
5857
- name: checkout
59-
uses: actions/checkout@v4
58+
uses: actions/checkout@v5
6059
- name: Unshallow
6160
run: |
6261
git fetch --prune --unshallow
@@ -70,6 +69,107 @@ jobs:
7069
- name: base
7170
run: |
7271
make base
72+
- name: release-notes
73+
if: startsWith(github.ref, 'refs/tags/')
74+
run: |
75+
make release-notes
76+
- name: Release
77+
if: startsWith(github.ref, 'refs/tags/')
78+
uses: softprops/action-gh-release@v2
79+
with:
80+
body_path: _out/RELEASE_NOTES.md
81+
draft: "true"
82+
lint:
83+
runs-on:
84+
group: generic
85+
if: github.event_name == 'pull_request'
86+
needs:
87+
- default
88+
steps:
89+
- name: gather-system-info
90+
id: system-info
91+
uses: kenchan0130/actions-system-info@v1.4.0
92+
continue-on-error: true
93+
- name: print-system-info
94+
run: |
95+
MEMORY_GB=$((${{ steps.system-info.outputs.totalmem }}/1024/1024/1024))
96+
97+
OUTPUTS=(
98+
"CPU Core: ${{ steps.system-info.outputs.cpu-core }}"
99+
"CPU Model: ${{ steps.system-info.outputs.cpu-model }}"
100+
"Hostname: ${{ steps.system-info.outputs.hostname }}"
101+
"NodeName: ${NODE_NAME}"
102+
"Kernel release: ${{ steps.system-info.outputs.kernel-release }}"
103+
"Kernel version: ${{ steps.system-info.outputs.kernel-version }}"
104+
"Name: ${{ steps.system-info.outputs.name }}"
105+
"Platform: ${{ steps.system-info.outputs.platform }}"
106+
"Release: ${{ steps.system-info.outputs.release }}"
107+
"Total memory: ${MEMORY_GB} GB"
108+
)
109+
110+
for OUTPUT in "${OUTPUTS[@]}";do
111+
echo "${OUTPUT}"
112+
done
113+
continue-on-error: true
114+
- name: checkout
115+
uses: actions/checkout@v5
116+
- name: Unshallow
117+
run: |
118+
git fetch --prune --unshallow
119+
- name: Set up Docker Buildx
120+
id: setup-buildx
121+
uses: docker/setup-buildx-action@v3
122+
with:
123+
driver: remote
124+
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
125+
timeout-minutes: 10
126+
- name: lint
127+
run: |
128+
make lint
129+
unit-tests:
130+
runs-on:
131+
group: generic
132+
if: github.event_name == 'pull_request'
133+
needs:
134+
- default
135+
steps:
136+
- name: gather-system-info
137+
id: system-info
138+
uses: kenchan0130/actions-system-info@v1.4.0
139+
continue-on-error: true
140+
- name: print-system-info
141+
run: |
142+
MEMORY_GB=$((${{ steps.system-info.outputs.totalmem }}/1024/1024/1024))
143+
144+
OUTPUTS=(
145+
"CPU Core: ${{ steps.system-info.outputs.cpu-core }}"
146+
"CPU Model: ${{ steps.system-info.outputs.cpu-model }}"
147+
"Hostname: ${{ steps.system-info.outputs.hostname }}"
148+
"NodeName: ${NODE_NAME}"
149+
"Kernel release: ${{ steps.system-info.outputs.kernel-release }}"
150+
"Kernel version: ${{ steps.system-info.outputs.kernel-version }}"
151+
"Name: ${{ steps.system-info.outputs.name }}"
152+
"Platform: ${{ steps.system-info.outputs.platform }}"
153+
"Release: ${{ steps.system-info.outputs.release }}"
154+
"Total memory: ${MEMORY_GB} GB"
155+
)
156+
157+
for OUTPUT in "${OUTPUTS[@]}";do
158+
echo "${OUTPUT}"
159+
done
160+
continue-on-error: true
161+
- name: checkout
162+
uses: actions/checkout@v5
163+
- name: Unshallow
164+
run: |
165+
git fetch --prune --unshallow
166+
- name: Set up Docker Buildx
167+
id: setup-buildx
168+
uses: docker/setup-buildx-action@v3
169+
with:
170+
driver: remote
171+
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
172+
timeout-minutes: 10
73173
- name: unit-tests
74174
run: |
75175
make unit-tests
@@ -80,18 +180,6 @@ jobs:
80180
uses: codecov/codecov-action@v5
81181
with:
82182
files: _out/coverage-unit-tests.txt
183+
flags: unit-tests
83184
token: ${{ secrets.CODECOV_TOKEN }}
84185
timeout-minutes: 3
85-
- name: lint
86-
run: |
87-
make lint
88-
- name: release-notes
89-
if: startsWith(github.ref, 'refs/tags/')
90-
run: |
91-
make release-notes
92-
- name: Release
93-
if: startsWith(github.ref, 'refs/tags/')
94-
uses: crazy-max/ghaction-github-release@v2
95-
with:
96-
body_path: _out/RELEASE_NOTES.md
97-
draft: "true"
Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-12-25T15:05:54Z by kres fcff05e.
3+
# Generated on 2025-11-03T14:52:39Z by kres cd5a938.
44

5-
name: slack-notify
65
"on":
76
workflow_run:
87
workflows:
98
- default
109
types:
1110
- completed
11+
name: slack-notify
1212
jobs:
1313
slack-notify:
1414
runs-on:
15-
- self-hosted
16-
- generic
15+
group: generic
1716
if: github.event.workflow_run.conclusion != 'skipped'
1817
steps:
1918
- name: Get PR number
@@ -29,64 +28,66 @@ jobs:
2928
method: chat.postMessage
3029
payload: |
3130
{
32-
"channel": "proj-talos-maintainers",
31+
"channel": "ci-all",
32+
"text": "${{ github.event.workflow_run.conclusion }} - ${{ github.repository }}",
33+
"icon_emoji": "${{ github.event.workflow_run.conclusion == 'success' && ':white_check_mark:' || github.event.workflow_run.conclusion == 'failure' && ':x:' || ':warning:' }}",
34+
"username": "GitHub Actions",
3335
"attachments": [
3436
{
35-
"color": "${{ github.event.workflow_run.conclusion == 'success' && '#2EB886' || github.event.workflow_run.conclusion == 'failure' && '#A30002' || '#FFCC00' }}",
36-
"fallback": "test",
3737
"blocks": [
3838
{
39-
"type": "section",
4039
"fields": [
4140
{
42-
"type": "mrkdwn",
43-
"text": "${{ github.event.workflow_run.event == 'pull_request' && format('*Pull Request:* {0} (`{1}`)\n<{2}/pull/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, steps.get-pr-number.outputs.pull_request_number, github.event.workflow_run.display_title) || format('*Build:* {0} (`{1}`)\n<{2}/commit/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, github.sha, github.event.workflow_run.display_title) }}"
41+
"text": "${{ github.event.workflow_run.event == 'pull_request' && format('*Pull Request:* {0} (`{1}`)\n<{2}/pull/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, steps.get-pr-number.outputs.pull_request_number, github.event.workflow_run.display_title) || format('*Build:* {0} (`{1}`)\n<{2}/commit/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, github.sha, github.event.workflow_run.display_title) }}",
42+
"type": "mrkdwn"
4443
},
4544
{
46-
"type": "mrkdwn",
47-
"text": "*Status:*\n`${{ github.event.workflow_run.conclusion }}`"
45+
"text": "*Status:*\n`${{ github.event.workflow_run.conclusion }}`",
46+
"type": "mrkdwn"
4847
}
49-
]
48+
],
49+
"type": "section"
5050
},
5151
{
52-
"type": "section",
5352
"fields": [
5453
{
55-
"type": "mrkdwn",
56-
"text": "*Author:*\n`${{ github.actor }}`"
54+
"text": "*Author:*\n`${{ github.actor }}`",
55+
"type": "mrkdwn"
5756
},
5857
{
59-
"type": "mrkdwn",
60-
"text": "*Event:*\n`${{ github.event.workflow_run.event }}`"
58+
"text": "*Event:*\n`${{ github.event.workflow_run.event }}`",
59+
"type": "mrkdwn"
6160
}
62-
]
61+
],
62+
"type": "section"
6363
},
6464
{
6565
"type": "divider"
6666
},
6767
{
68-
"type": "actions",
6968
"elements": [
7069
{
71-
"type": "button",
7270
"text": {
73-
"type": "plain_text",
74-
"text": "Logs"
71+
"text": "Logs",
72+
"type": "plain_text"
7573
},
74+
"type": "button",
7675
"url": "${{ github.event.workflow_run.html_url }}"
7776
},
7877
{
79-
"type": "button",
8078
"text": {
81-
"type": "plain_text",
82-
"text": "Commit"
79+
"text": "Commit",
80+
"type": "plain_text"
8381
},
82+
"type": "button",
8483
"url": "${{ github.event.repository.html_url }}/commit/${{ github.sha }}"
8584
}
86-
]
85+
],
86+
"type": "actions"
8787
}
88-
]
88+
],
89+
"color": "${{ github.event.workflow_run.conclusion == 'success' && '#2EB886' || github.event.workflow_run.conclusion == 'failure' && '#A30002' || '#FFCC00' }}"
8990
}
9091
]
9192
}
92-
token: ${{ secrets.SLACK_BOT_TOKEN }}
93+
token: ${{ secrets.SLACK_BOT_TOKEN_V2 }}

0 commit comments

Comments
 (0)