github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18901 from kargakis/inert-deployments

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-27 05:14:38 -08:00
parent 63ec304e42 06c0a4718a
commit bd7255a27e
11 changed files with 10353 additions and 10162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/deployment/deployment_controller.go
View File

@@ -410,6 +410,11 @@ func (dc *DeploymentController) syncDeployment(key string) error {
return nil
}
if d.Spec.Paused {
// Ignore paused deployments
glog.V(4).Infof("Ignoring paused deployment %s/%s", d.Namespace, d.Name)
return nil
}
switch d.Spec.Strategy.Type {
case extensions.RecreateDeploymentStrategyType:
return dc.syncRecreateDeployment(d)