github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15273 from nikhiljindal/deploymentAPI 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-10-08 16:28:53 -07:00
parent 0c089dcf11 119150fd33
commit 79b70df747
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/apis/experimental/types.go
View File

@ -204,7 +204,7 @@ type DeploymentSpec struct {
Replicas int `json:"replicas,omitempty"`
// Label selector for pods. Existing ReplicationControllers whose pods are
// selected by this will be scaled down.
// selected by this will be the ones affected by this deployment.
Selector map[string]string `json:"selector,omitempty"`
// Template describes the pods that will be created.
@ -279,11 +279,10 @@ type RollingUpdateDeployment struct {
}
type DeploymentStatus struct {
// Total number of ready pods targeted by this deployment (this
// includes both the old and new pods).
// Total number of non-terminated pods targeted by this deployment (their labels match the selector).
Replicas int `json:"replicas,omitempty"`
// Total number of new ready pods with the desired template spec.
// Total number of non-terminated pods targeted by this deployment that have the desired template spec.
UpdatedReplicas int `json:"updatedReplicas,omitempty"`
}

7
pkg/apis/experimental/v1alpha1/types.go
View File

@ -198,7 +198,7 @@ type DeploymentSpec struct {
Replicas *int `json:"replicas,omitempty"`
// Label selector for pods. Existing ReplicationControllers whose pods are
// selected by this will be scaled down.
// selected by this will be the ones affected by this deployment.
Selector map[string]string `json:"selector,omitempty"`
// Template describes the pods that will be created.
@ -276,11 +276,10 @@ type RollingUpdateDeployment struct {
// DeploymentStatus is the most recently observed status of the Deployment.
type DeploymentStatus struct {
// Total number of ready pods targeted by this deployment (this
// includes both the old and new pods).
// Total number of non-terminated pods targeted by this deployment (their labels match the selector).
Replicas int `json:"replicas,omitempty"`
// Total number of new ready pods with the desired template spec.
// Total number of non-terminated pods targeted by this deployment that have the desired template spec.
UpdatedReplicas int `json:"updatedReplicas,omitempty"`
}

6
pkg/apis/experimental/v1alpha1/types_swagger_doc_generated.go
View File

@ -132,7 +132,7 @@ func (DeploymentList) SwaggerDoc() map[string]string {
var map_DeploymentSpec = map[string]string{
"": "DeploymentSpec is the specification of the desired behavior of the Deployment.",
"replicas": "Number of desired pods. This is a pointer to distinguish between explicit zero and not specified. Defaults to 1.",
"selector": "Label selector for pods. Existing ReplicationControllers whose pods are selected by this will be scaled down.",
"selector": "Label selector for pods. Existing ReplicationControllers whose pods are selected by this will be the ones affected by this deployment.",
"template": "Template describes the pods that will be created.",
"strategy": "The deployment strategy to use to replace existing pods with new ones.",
"uniqueLabelKey": "Key of the selector that is added to existing RCs (and label key that is added to its pods) to prevent the existing RCs to select new pods (and old pods being selected by new RC). Users can set this to an empty string to indicate that the system should not add any selector and label. If unspecified, system uses \"deployment.kubernetes.io/podTemplateHash\". Value of this key is hash of DeploymentSpec.PodTemplateSpec. No label is added if this is set to empty string.",
@ -144,8 +144,8 @@ func (DeploymentSpec) SwaggerDoc() map[string]string {
var map_DeploymentStatus = map[string]string{
"": "DeploymentStatus is the most recently observed status of the Deployment.",
"replicas": "Total number of ready pods targeted by this deployment (this includes both the old and new pods).",
"updatedReplicas": "Total number of new ready pods with the desired template spec.",
"replicas": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
"updatedReplicas": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
}
func (DeploymentStatus) SwaggerDoc() map[string]string {