Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-49906: Bump k8s api to 1.29.13 #2199

Closed
wants to merge 28 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
89f2bea
Update CHANGELOG/CHANGELOG-1.29.md for v1.29.11
k8s-release-robot Nov 20, 2024
0a3c63d
skip TestCreateBlobDisk test
cpanato Nov 27, 2024
3e12efa
Merge pull request #129011 from cpanato/remove-test
k8s-ci-robot Nov 28, 2024
f173863
Bump images, dependencies and versions to go 1.22.9 and distroless ip…
cpanato Nov 21, 2024
4d9e753
Merge pull request #128914 from cpanato/update-go-129
k8s-ci-robot Nov 28, 2024
81d77f6
kubelet: Fix the volume manager did't check the device mount state in…
carlory Oct 21, 2024
9253c9b
Release commit for Kubernetes v1.29.12
k8s-release-robot Dec 10, 2024
4307657
Update CHANGELOG/CHANGELOG-1.29.md for v1.29.12
k8s-release-robot Dec 10, 2024
84c2c93
prevent unnecessary resolving of iscsi/fc devices to dm
RomanBednar Oct 15, 2024
781ee6b
fetch cni plugins from GitHub releases
upodroid Dec 5, 2024
8c3d788
Do not attempt to truncate revision history if revisionHistoryLimit i…
ardaguclu Dec 19, 2024
3e0dede
Bump images, dependencies and versions to go 1.22.10 and distroless i…
cpanato Dec 30, 2024
6069f7a
Merge pull request #129426 from cpanato/update-go1234-rel129
k8s-ci-robot Dec 30, 2024
140ef24
Merge pull request #129272 from ameukam/automated-cherry-pick-of-#129…
k8s-ci-robot Jan 6, 2025
bfce92e
webhook: alter regex to account for x509sha1 GODEBUG removal
MadhavJivrajani Dec 30, 2024
67b42be
Fix kubelet on Windows fails if a pod has SecurityContext with RunAsU…
carlory May 22, 2024
658dded
Merge pull request #129508 from carlory/automated-cherry-pick-of-#125…
k8s-ci-robot Jan 7, 2025
51f92e0
Merge pull request #129064 from carlory/automated-cherry-pick-of-#128…
k8s-ci-robot Jan 8, 2025
107c0d3
Merge pull request #129183 from RomanBednar/automated-cherry-pick-of-…
k8s-ci-robot Jan 8, 2025
0b6f50c
Merge pull request #129325 from ardaguclu/automated-cherry-pick-of-#1…
k8s-ci-robot Jan 9, 2025
86e25a0
Merge pull request #129492 from MadhavJivrajani/129-go124-webhook-reg…
k8s-ci-robot Jan 9, 2025
1e45808
kubelet: use env vars in node log query PS command
aravindhp Aug 6, 2024
fb0187c
Merge pull request #129603 from aravindhp/automated-cherry-pick-of-#1…
k8s-ci-robot Jan 14, 2025
9a58e93
Release commit for Kubernetes v1.29.13
k8s-release-robot Jan 15, 2025
72a8ff2
Merge tag 'v1.29.13' into bump-1.29.13
jerpeter1 Feb 6, 2025
de57547
UPSTREAM: <drop>: manually resolve conflicts
jerpeter1 Feb 6, 2025
e8fc708
UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
jerpeter1 Feb 6, 2025
9039022
Fix for Test_getLoggingCmd test
jerpeter1 Feb 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/kubelet/kubelet_server_journal_linux.go
Original file line number Diff line number Diff line change
@@ -52,6 +52,16 @@ func getLoggingCmd(n *nodeLogQuery, services []string) (cmd string, args []strin
if n.TailLines != nil {
args = append(args, "--pager-end", fmt.Sprintf("--lines=%d", *n.TailLines))
}

var output string
if len(n.Format) > 0 {
output = n.Format
} else {
output = "short-precise"
}

args = append(args, fmt.Sprintf("--output=%s", output))

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reminder to follow the same approach as e25d066#r1944617492

for _, service := range services {
if len(service) > 0 {
args = append(args, "--unit="+service)