Skip to content

Commit

Permalink
Merge pull request kubernetes#62925 from sjenning/fixup-qosreserved-tag
Browse files Browse the repository at this point in the history
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 kubernetes#62509

@mtaufen @derekwaynecarr
  • Loading branch information
Kubernetes Submit Queue authored Apr 24, 2018
2 parents 42415e3 + 0e5df1f commit 61a8454
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/kubelet/apis/kubeletconfig/v1beta1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 61a8454

Please sign in to comment.