github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Address comments

Browse Source
This commit is contained in:
Janet Kuo 2016-02-17 12:54:21 -08:00
parent 11fdbff97f
commit 14bab2bb3a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/util/deployment/deployment.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
extensions_unversioned "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned" unversionedextensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/util/integer" "k8s.io/kubernetes/pkg/util/integer"
intstrutil "k8s.io/kubernetes/pkg/util/intstr" intstrutil "k8s.io/kubernetes/pkg/util/intstr"
@ -183,8 +183,13 @@ func addHashKeyToRSAndPods(deployment extensions.Deployment, c clientset.Interfa
return nil, err return nil, err
} }
for _, pod := range podList.Items { for _, pod := range podList.Items {
// If the pod already has the new hash label, avoid re-labeling it
if len(pod.Labels) > 0 && len(pod.Labels[extensions.DefaultDeploymentUniqueLabelKey]) > 0 {
continue
}
pod.Labels = labelsutil.AddLabel(pod.Labels, extensions.DefaultDeploymentUniqueLabelKey, hash) pod.Labels = labelsutil.AddLabel(pod.Labels, extensions.DefaultDeploymentUniqueLabelKey, hash)
delay, maxRetries := 3, 3 delay, maxRetries := 3, 3
podName := pod.Name
for i := 0; i < maxRetries; i++ { for i := 0; i < maxRetries; i++ {
_, err = c.Core().Pods(namespace).Update(&pod) _, err = c.Core().Pods(namespace).Update(&pod)
if err == nil { if err == nil {
@ -192,6 +197,11 @@ func addHashKeyToRSAndPods(deployment extensions.Deployment, c clientset.Interfa
} }
time.Sleep(time.Second * time.Duration(delay)) time.Sleep(time.Second * time.Duration(delay))
delay *= delay delay *= delay
getPod, err := c.Core().Pods(namespace).Get(podName)
if err != nil {
return nil, err
}
pod = *getPod
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -233,7 +243,7 @@ func addHashKeyToRSAndPods(deployment extensions.Deployment, c clientset.Interfa
type updateFunc func(rs *extensions.ReplicaSet) type updateFunc func(rs *extensions.ReplicaSet)
func updateRSWithRetries(rsClient extensions_unversioned.ReplicaSetInterface, rs *extensions.ReplicaSet, applyUpdate updateFunc) (*extensions.ReplicaSet, error) { func updateRSWithRetries(rsClient unversionedextensions.ReplicaSetInterface, rs *extensions.ReplicaSet, applyUpdate updateFunc) (*extensions.ReplicaSet, error) {
var err error var err error
oldRs := rs oldRs := rs
err = wait.Poll(10*time.Millisecond, 1*time.Minute, func() (bool, error) { err = wait.Poll(10*time.Millisecond, 1*time.Minute, func() (bool, error) {