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

Merge pull request #36491 from kargakis/panic-deployment-controller

Browse Source 
Automatic merge from submit-queue

controller: fix panic in deployments

Fixes https://github.com/kubernetes/kubernetes/issues/36488

@kubernetes/deployment
This commit is contained in:
Kubernetes Submit Queue 2016-11-09 06:12:29 -08:00 committed by GitHub
commit 5464d42a36
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,8 +87,9 @@ func (dc *DeploymentController) syncRolloutStatus(allRSs []*extensions.ReplicaSe
currentCond := util.GetDeploymentCondition(d.Status, extensions.DeploymentProgressing) currentCond := util.GetDeploymentCondition(d.Status, extensions.DeploymentProgressing)
isResyncEvent := newStatus.Replicas == newStatus.UpdatedReplicas && currentCond != nil && currentCond.Reason == util.NewRSAvailableReason isResyncEvent := newStatus.Replicas == newStatus.UpdatedReplicas && currentCond != nil && currentCond.Reason == util.NewRSAvailableReason
// Check for progress only if there is a progress deadline set and the latest rollout // Check for progress only if there is a progress deadline set and the latest rollout
// hasn't completed yet. // hasn't completed yet. We also need to ensure the new replica set exists, otherwise
if d.Spec.ProgressDeadlineSeconds != nil && !isResyncEvent { // we cannot estimate any progress.
if d.Spec.ProgressDeadlineSeconds != nil && !isResyncEvent && newRS != nil {
switch { switch {
case util.DeploymentComplete(d, &newStatus): case util.DeploymentComplete(d, &newStatus):
// Update the deployment conditions with a message for the new replica set that // Update the deployment conditions with a message for the new replica set that