Skip to content

Commit af167c8

Browse files
committed
fix kubectl in audit
1 parent 9ce3d5c commit af167c8

2 files changed

Lines changed: 16 additions & 14 deletions

File tree

audit.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
system:
2-
date: 26.09.2025 14:23:48
2+
date: 26.09.2025 14:56:59
33
go: 1.23.2
44
os: linux Ubuntu 25.04 (Plucky Puffin)
55
arch: amd64
66
username: lifailon
77
privilege: user
88
execType: source code
9-
execPath: /tmp/go-build2350183963/b001/exe/main
9+
execPath: /tmp/go-build475463870/b001/exe/main
1010
systemd:
1111
journald:
1212
- installed: true
1313
journals:
1414
- name: Unit list
15-
count: 795
15+
count: 797
1616
- name: System journals
17-
count: 51000
17+
count: 51004
1818
- name: User journals
19-
count: 46
19+
count: 89
2020
- name: Kernel boot
2121
count: 16
2222
fileSystem:
2323
files:
2424
- name: System var logs
2525
path: /var/log/
26-
count: 63
26+
count: 64
2727
- name: Optional package logs
2828
path: /opt/
2929
count: 1
@@ -39,15 +39,15 @@ containerization:
3939
installed: true
4040
version: 27.5.1
4141
containers: 22
42-
- name: compose
42+
- name: docker compose
4343
installed: true
4444
version: 2.39.2
4545
stacks: 5
4646
- name: podman
4747
installed: true
4848
version: 5.4.1
4949
containers: 0
50-
- name: kubernetes
50+
- name: kubernetes (kubectl)
5151
installed: true
5252
version: 1.33.3+k3s1
53-
pods: 0
53+
pods: 69

main.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -497,14 +497,15 @@ func (app *App) showAudit() {
497497
)
498498
containerizationSystems := []string{
499499
"docker",
500-
"compose",
500+
"docker compose",
501501
"podman",
502-
"kubernetes",
502+
"kubernetes (kubectl)",
503503
}
504504
for _, cs := range containerizationSystems {
505505
auditText = append(auditText, " - name: "+cs)
506506
switch cs {
507-
case "compose":
507+
case "docker compose":
508+
cs = "compose"
508509
csCheck := exec.Command("docker", "compose", "version")
509510
output, err := csCheck.Output()
510511
if err == nil {
@@ -525,8 +526,9 @@ func (app *App) showAudit() {
525526
} else {
526527
auditText = append(auditText, " installed: false")
527528
}
528-
case "kubernetes":
529-
csCheck := exec.Command("kubectl", "version")
529+
case "kubernetes (kubectl)":
530+
cs = "kubectl"
531+
csCheck := exec.Command(cs, "version")
530532
output, _ := csCheck.Output()
531533
// По умолчанию у version код возврата всегда 1, по этому проверяем вывод
532534
if strings.Contains(string(output), "Version:") {

0 commit comments

Comments
 (0)