From 52a05d163230054b655d4154557510a4fcfa8d2d Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Fri, 9 Jun 2017 11:13:37 -0700 Subject: [PATCH] Do not add unique label to DaemonSet --- pkg/controller/daemon/update.go | 14 -------------- test/e2e/daemon_set.go | 12 ++++-------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/pkg/controller/daemon/update.go b/pkg/controller/daemon/update.go index 5283e054f0e..3f95813cd9e 100644 --- a/pkg/controller/daemon/update.go +++ b/pkg/controller/daemon/update.go @@ -146,20 +146,6 @@ func (dsc *DaemonSetsController) constructHistory(ds *extensions.DaemonSet) (cur } } } - // Label ds with current history's unique label as well - if ds.Labels[extensions.DefaultDaemonSetUniqueLabelKey] != cur.Labels[extensions.DefaultDaemonSetUniqueLabelKey] { - var clone interface{} - clone, err = api.Scheme.DeepCopy(ds) - if err != nil { - return nil, nil, err - } - toUpdate := clone.(*extensions.DaemonSet) - if toUpdate.Labels == nil { - toUpdate.Labels = make(map[string]string) - } - toUpdate.Labels[extensions.DefaultDaemonSetUniqueLabelKey] = cur.Labels[extensions.DefaultDaemonSetUniqueLabelKey] - _, err = dsc.kubeClient.ExtensionsV1beta1().DaemonSets(ds.Namespace).UpdateStatus(toUpdate) - } return cur, old, err } diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index 91768528f25..01f08caf2a1 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -269,8 +269,7 @@ var _ = framework.KubeDescribe("Daemon set [Serial]", func() { ds, err = c.Extensions().DaemonSets(ns).Get(ds.Name, metav1.GetOptions{}) Expect(err).NotTo(HaveOccurred()) first := curHistory(listDaemonHistories(c, ns, label), ds) - firstHash := ds.Labels[extensions.DefaultDaemonSetUniqueLabelKey] - Expect(first.Labels[extensions.DefaultDaemonSetUniqueLabelKey]).To(Equal(firstHash)) + firstHash := first.Labels[extensions.DefaultDaemonSetUniqueLabelKey] Expect(first.Revision).To(Equal(int64(1))) checkDaemonSetPodsLabels(listDaemonPods(c, ns, label), firstHash, templateGeneration) @@ -296,9 +295,8 @@ var _ = framework.KubeDescribe("Daemon set [Serial]", func() { ds, err = c.Extensions().DaemonSets(ns).Get(ds.Name, metav1.GetOptions{}) Expect(err).NotTo(HaveOccurred()) cur := curHistory(listDaemonHistories(c, ns, label), ds) - curHash := ds.Labels[extensions.DefaultDaemonSetUniqueLabelKey] - Expect(cur.Labels[extensions.DefaultDaemonSetUniqueLabelKey]).To(Equal(curHash)) Expect(cur.Revision).To(Equal(int64(2))) + Expect(cur.Labels[extensions.DefaultDaemonSetUniqueLabelKey]).NotTo(Equal(firstHash)) checkDaemonSetPodsLabels(listDaemonPods(c, ns, label), firstHash, templateGeneration) }) @@ -326,8 +324,7 @@ var _ = framework.KubeDescribe("Daemon set [Serial]", func() { ds, err = c.Extensions().DaemonSets(ns).Get(ds.Name, metav1.GetOptions{}) Expect(err).NotTo(HaveOccurred()) cur := curHistory(listDaemonHistories(c, ns, label), ds) - hash := ds.Labels[extensions.DefaultDaemonSetUniqueLabelKey] - Expect(cur.Labels[extensions.DefaultDaemonSetUniqueLabelKey]).To(Equal(hash)) + hash := cur.Labels[extensions.DefaultDaemonSetUniqueLabelKey] Expect(cur.Revision).To(Equal(int64(1))) checkDaemonSetPodsLabels(listDaemonPods(c, ns, label), hash, fmt.Sprint(templateGeneration)) @@ -354,8 +351,7 @@ var _ = framework.KubeDescribe("Daemon set [Serial]", func() { ds, err = c.Extensions().DaemonSets(ns).Get(ds.Name, metav1.GetOptions{}) Expect(err).NotTo(HaveOccurred()) cur = curHistory(listDaemonHistories(c, ns, label), ds) - hash = ds.Labels[extensions.DefaultDaemonSetUniqueLabelKey] - Expect(cur.Labels[extensions.DefaultDaemonSetUniqueLabelKey]).To(Equal(hash)) + hash = cur.Labels[extensions.DefaultDaemonSetUniqueLabelKey] Expect(cur.Revision).To(Equal(int64(2))) checkDaemonSetPodsLabels(listDaemonPods(c, ns, label), hash, fmt.Sprint(templateGeneration)) })