From 9493f5fceb05505b2877bf41282d389b7be31fe2 Mon Sep 17 00:00:00 2001 From: "Bobby (Babak) Salamat" Date: Thu, 18 Jan 2018 01:04:32 -0800 Subject: [PATCH] Update PriorityClassName API doc --- pkg/apis/core/types.go | 7 ++++--- staging/src/k8s.io/api/core/v1/types.go | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkg/apis/core/types.go b/pkg/apis/core/types.go index e036d0721b9..fbc52918ec8 100644 --- a/pkg/apis/core/types.go +++ b/pkg/apis/core/types.go @@ -2568,9 +2568,10 @@ type PodSpec struct { // file if specified. This is only valid for non-hostNetwork pods. // +optional HostAliases []HostAlias - // If specified, indicates the pod's priority. "SYSTEM" is a special keyword - // which indicates the highest priority. Any other name must be defined by - // creating a PriorityClass object with that name. + // If specified, indicates the pod's priority. "system-node-critical" and + // "system-cluster-critical" are two special keywords which indicate the + // highest priorities with the former being the highest priority. Any other + // name must be defined by creating a PriorityClass object with that name. // If not specified, the pod priority will be default or zero if there is no // default. // +optional diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index 49ef6109276..902ecf4b1d4 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -2879,9 +2879,10 @@ type PodSpec struct { // +patchMergeKey=ip // +patchStrategy=merge HostAliases []HostAlias `json:"hostAliases,omitempty" patchStrategy:"merge" patchMergeKey:"ip" protobuf:"bytes,23,rep,name=hostAliases"` - // If specified, indicates the pod's priority. "SYSTEM" is a special keyword - // which indicates the highest priority. Any other name must be defined by - // creating a PriorityClass object with that name. + // If specified, indicates the pod's priority. "system-node-critical" and + // "system-cluster-critical" are two special keywords which indicate the + // highest priorities with the former being the highest priority. Any other + // name must be defined by creating a PriorityClass object with that name. // If not specified, the pod priority will be default or zero if there is no // default. // +optional