github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 12:11:43 +00:00
Code Issues Projects Releases Wiki Activity

update things

Browse Source
This commit is contained in:
David Ashpole
2017-07-20 15:28:23 -07:00
parent 7a23f8b018
commit 9bfa28bdff
9 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/openapi-spec/swagger.json
View File

@@ -51454,7 +51454,7 @@
"type": "string" "type": "string"
}, },
"reason": { "reason": {
"description": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'OutOfDisk'", "description": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'Evicted'",
"type": "string" "type": "string"
}, },
"startTime": { "startTime": {

2
api/swagger-spec/v1.json
View File

@@ -20979,7 +20979,7 @@
}, },
"reason": { "reason": {
"type": "string", "type": "string",
"description": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'OutOfDisk'" "description": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'Evicted'"
}, },
"hostIP": { "hostIP": {
"type": "string", "type": "string",

2
docs/api-reference/scheduling.k8s.io/v1alpha1/definitions.html
View File

@@ -1347,7 +1347,7 @@ Examples:<br>
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2017-07-18 22:23:24 UTC
</div> </div>
</div> </div>
</body> </body>

2
docs/api-reference/scheduling.k8s.io/v1alpha1/operations.html
View File

@@ -1702,7 +1702,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2017-07-18 22:23:24 UTC
</div> </div>
</div> </div>
</body> </body>

4
pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go
View File

@@ -429,7 +429,6 @@ func autoConvert_v1alpha1_KubeletConfiguration_To_componentconfig_KubeletConfigu
if err := v1.Convert_Pointer_int32_To_int32(&in.ImageGCLowThresholdPercent, &out.ImageGCLowThresholdPercent, s); err != nil { if err := v1.Convert_Pointer_int32_To_int32(&in.ImageGCLowThresholdPercent, &out.ImageGCLowThresholdPercent, s); err != nil {
return err return err
} }
out.LowDiskSpaceThresholdMB = in.LowDiskSpaceThresholdMB
out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod
out.VolumePluginDir = in.VolumePluginDir out.VolumePluginDir = in.VolumePluginDir
out.CloudProvider = in.CloudProvider out.CloudProvider = in.CloudProvider
@@ -474,7 +473,6 @@ func autoConvert_v1alpha1_KubeletConfiguration_To_componentconfig_KubeletConfigu
if err := v1.Convert_Pointer_bool_To_bool(&in.SerializeImagePulls, &out.SerializeImagePulls, s); err != nil { if err := v1.Convert_Pointer_bool_To_bool(&in.SerializeImagePulls, &out.SerializeImagePulls, s); err != nil {
return err return err
} }
out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency
out.NodeLabels = *(*map[string]string)(unsafe.Pointer(&in.NodeLabels)) out.NodeLabels = *(*map[string]string)(unsafe.Pointer(&in.NodeLabels))
out.NonMasqueradeCIDR = in.NonMasqueradeCIDR out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
out.EnableCustomMetrics = in.EnableCustomMetrics out.EnableCustomMetrics = in.EnableCustomMetrics
@@ -609,7 +607,6 @@ func autoConvert_componentconfig_KubeletConfiguration_To_v1alpha1_KubeletConfigu
if err := v1.Convert_int32_To_Pointer_int32(&in.ImageGCLowThresholdPercent, &out.ImageGCLowThresholdPercent, s); err != nil { if err := v1.Convert_int32_To_Pointer_int32(&in.ImageGCLowThresholdPercent, &out.ImageGCLowThresholdPercent, s); err != nil {
return err return err
} }
out.LowDiskSpaceThresholdMB = in.LowDiskSpaceThresholdMB
out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod
out.VolumePluginDir = in.VolumePluginDir out.VolumePluginDir = in.VolumePluginDir
out.CloudProvider = in.CloudProvider out.CloudProvider = in.CloudProvider
@@ -658,7 +655,6 @@ func autoConvert_componentconfig_KubeletConfiguration_To_v1alpha1_KubeletConfigu
if err := v1.Convert_bool_To_Pointer_bool(&in.SerializeImagePulls, &out.SerializeImagePulls, s); err != nil { if err := v1.Convert_bool_To_Pointer_bool(&in.SerializeImagePulls, &out.SerializeImagePulls, s); err != nil {
return err return err
} }
out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency
out.NodeLabels = *(*map[string]string)(unsafe.Pointer(&in.NodeLabels)) out.NodeLabels = *(*map[string]string)(unsafe.Pointer(&in.NodeLabels))
out.NonMasqueradeCIDR = in.NonMasqueradeCIDR out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
out.EnableCustomMetrics = in.EnableCustomMetrics out.EnableCustomMetrics = in.EnableCustomMetrics

1
pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go
View File

@@ -493,7 +493,6 @@ func (in *KubeletConfiguration) DeepCopyInto(out *KubeletConfiguration) {
**out = **in **out = **in
} }
} }
out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency
if in.NodeLabels != nil { if in.NodeLabels != nil {
in, out := &in.NodeLabels, &out.NodeLabels in, out := &in.NodeLabels, &out.NodeLabels
*out = make(map[string]string, len(*in)) *out = make(map[string]string, len(*in))

1
pkg/apis/componentconfig/zz_generated.deepcopy.go
View File

@@ -434,7 +434,6 @@ func (in *KubeletConfiguration) DeepCopyInto(out *KubeletConfiguration) {
(*in)[i].DeepCopyInto(&(*out)[i]) (*in)[i].DeepCopyInto(&(*out)[i])
} }
} }
out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency
if in.NodeLabels != nil { if in.NodeLabels != nil {
in, out := &in.NodeLabels, &out.NodeLabels in, out := &in.NodeLabels, &out.NodeLabels
*out = make(map[string]string, len(*in)) *out = make(map[string]string, len(*in))

2
staging/src/k8s.io/api/core/v1/generated.proto
View File

@@ -2830,7 +2830,7 @@ message PodStatus {
optional string message = 3; optional string message = 3;
// A brief CamelCase message indicating details about why the pod is in this state. // A brief CamelCase message indicating details about why the pod is in this state.
// e.g. 'OutOfDisk' // e.g. 'Evicted'
// +optional // +optional
optional string reason = 4; optional string reason = 4;

2
staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go
View File

@@ -1389,7 +1389,7 @@ var map_PodStatus = map[string]string{
"phase": "Current condition of the pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#pod-phase", "phase": "Current condition of the pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#pod-phase",
"conditions": "Current service state of pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#pod-conditions", "conditions": "Current service state of pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#pod-conditions",
"message": "A human readable message indicating details about why the pod is in this condition.", "message": "A human readable message indicating details about why the pod is in this condition.",
"reason": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'OutOfDisk'", "reason": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'Evicted'",
"hostIP": "IP address of the host to which the pod is assigned. Empty if not yet scheduled.", "hostIP": "IP address of the host to which the pod is assigned. Empty if not yet scheduled.",
"podIP": "IP address allocated to the pod. Routable at least within the cluster. Empty if not yet allocated.", "podIP": "IP address allocated to the pod. Routable at least within the cluster. Empty if not yet allocated.",
"startTime": "RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod.", "startTime": "RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod.",