scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ignoring the rest of deployments after the first error in deployment controller.

Browse Source 
Fixed ignoring the rest of deployments after the first error in deployment controller & added logging of errors.
This commit is contained in:
Jerzy Szczepkowski
2015-09-29 17:09:33 +02:00
parent 0f8adc5d53
commit e5b2f310fb
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,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 {
@@ -238,7 +242,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)
@@ -270,7 +274,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)