github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14746 from jszczepkowski/deployment-fix

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-01 18:23:12 -07:00
commit 2b1a0e98a2
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ import (
"math" "math"
"time" "time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/experimental" "k8s.io/kubernetes/pkg/apis/experimental"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
@ -44,22 +45,25 @@ func New(client client.Interface) *DeploymentController {
func (d *DeploymentController) Run(syncPeriod time.Duration) { func (d *DeploymentController) Run(syncPeriod time.Duration) {
go util.Until(func() { go util.Until(func() {
if err := d.reconcileDeployments(); err != nil { errs := d.reconcileDeployments()
for _, err := range errs {
glog.Errorf("Failed to reconcile: %v", err)
} }
}, syncPeriod, util.NeverStop) }, syncPeriod, util.NeverStop)
} }
func (d *DeploymentController) reconcileDeployments() error { func (d *DeploymentController) reconcileDeployments() []error {
list, err := d.expClient.Deployments(api.NamespaceAll).List(labels.Everything(), fields.Everything()) list, err := d.expClient.Deployments(api.NamespaceAll).List(labels.Everything(), fields.Everything())
if err != nil { if err != nil {
return fmt.Errorf("error listing deployments: %v", err) return []error{fmt.Errorf("error listing deployments: %v", err)}
} }
errs := []error{}
for _, deployment := range list.Items { for _, deployment := range list.Items {
if err := d.reconcileDeployment(&deployment); err != nil { if err := d.reconcileDeployment(&deployment); err != nil {
return fmt.Errorf("error in reconciling deployment: %v", err) errs = append(errs, fmt.Errorf("error in reconciling deployment %s: %v", deployment.Name, err))
} }
} }
return nil return errs
} }
func (d *DeploymentController) reconcileDeployment(deployment *experimental.Deployment) error { func (d *DeploymentController) reconcileDeployment(deployment *experimental.Deployment) error {
@ -69,7 +73,7 @@ func (d *DeploymentController) reconcileDeployment(deployment *experimental.Depl
case experimental.RollingUpdateDeploymentStrategyType: case experimental.RollingUpdateDeploymentStrategyType:
return d.reconcileRollingUpdateDeployment(*deployment) return d.reconcileRollingUpdateDeployment(*deployment)
} }
return fmt.Errorf("Unexpected deployment strategy type: %s", deployment.Spec.Strategy.Type) return fmt.Errorf("unexpected deployment strategy type: %s", deployment.Spec.Strategy.Type)
} }
func (d *DeploymentController) reconcileRecreateDeployment(deployment experimental.Deployment) error { func (d *DeploymentController) reconcileRecreateDeployment(deployment experimental.Deployment) error {
@ -176,7 +180,7 @@ func (d *DeploymentController) scaleUp(allRCs []*api.ReplicationController, newR
} }
maxSurge, isPercent, err := util.GetIntOrPercentValue(&deployment.Spec.Strategy.RollingUpdate.MaxSurge) maxSurge, isPercent, err := util.GetIntOrPercentValue(&deployment.Spec.Strategy.RollingUpdate.MaxSurge)
if err != nil { if err != nil {
return false, fmt.Errorf("Invalid value for MaxSurge: %v", err) return false, fmt.Errorf("invalid value for MaxSurge: %v", err)
} }
if isPercent { if isPercent {
maxSurge = util.GetValueFromPercent(maxSurge, deployment.Spec.Replicas) maxSurge = util.GetValueFromPercent(maxSurge, deployment.Spec.Replicas)
@ -208,7 +212,7 @@ func (d *DeploymentController) scaleDown(allRCs []*api.ReplicationController, ol
} }
maxUnavailable, isPercent, err := util.GetIntOrPercentValue(&deployment.Spec.Strategy.RollingUpdate.MaxUnavailable) maxUnavailable, isPercent, err := util.GetIntOrPercentValue(&deployment.Spec.Strategy.RollingUpdate.MaxUnavailable)
if err != nil { if err != nil {
return false, fmt.Errorf("Invalid value for MaxUnavailable: %v", err) return false, fmt.Errorf("invalid value for MaxUnavailable: %v", err)
} }
if isPercent { if isPercent {
maxUnavailable = util.GetValueFromPercent(maxUnavailable, deployment.Spec.Replicas) maxUnavailable = util.GetValueFromPercent(maxUnavailable, deployment.Spec.Replicas)