Unverified Commit 61a8454c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #62925 from sjenning/fixup-qosreserved-tag

Automatic merge from submit-queue (batch tested with PRs 63046, 62925, 63014). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubelet: fixup QOSReserved json tag Fix up follow on to https://github.com/kubernetes/kubernetes/pull/62509 @mtaufen @derekwaynecarr
parents 42415e31 0e5df1fe
......@@ -260,7 +260,7 @@ type KubeletConfiguration struct {
// Requires the QOSReserved feature gate to be enabled.
// Default: nil
// +optional
QOSReserved map[string]string
QOSReserved map[string]string `json:"QOSReserved,omitempty"`
// runtimeRequestTimeout is the timeout for all runtime requests except long running
// requests - pull, logs, exec and attach.
// Default: "2m"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment