Implement DaemonSet history logic in controller

1. Create controllerrevisions (history) and label pods with template
   hash for both RollingUpdate and OnDelete update strategy
2. Clean up old, non-live history based on revisionHistoryLimit
3. Remove duplicate controllerrevisions (the ones with the same template)
   and relabel their pods
4. Update RBAC to allow DaemonSet controller to manage
   controllerrevisions
5. In DaemonSet controller unit tests, create new pods with hash labels

pkg/controller/deployment/sync.go

@@ -288,7 +288,7 @@ func (dc *DeploymentController) getNewReplicaSet(d *extensions.Deployment, rsLis
 		return nil, err
 	}
 	newRSTemplate := templateCopy.(v1.PodTemplateSpec)
-	podTemplateSpecHash := fmt.Sprintf("%d", deploymentutil.GetPodTemplateSpecHash(&newRSTemplate, d.Status.CollisionCount))
+	podTemplateSpecHash := fmt.Sprintf("%d", controller.ComputeHash(&newRSTemplate, d.Status.CollisionCount))
 	newRSTemplate.Labels = labelsutil.CloneAndAddLabel(d.Spec.Template.Labels, extensions.DefaultDeploymentUniqueLabelKey, podTemplateSpecHash)
 	// Add podTemplateHash label to selector.
 	newRSSelector := labelsutil.CloneSelectorAndAddLabel(d.Spec.Selector, extensions.DefaultDeploymentUniqueLabelKey, podTemplateSpecHash)

pkg/controller/deployment/util/hash_test.go

@@ -24,6 +24,7 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/kubernetes/pkg/controller"
 	hashutil "k8s.io/kubernetes/pkg/util/hash"
 )
 
@@ -110,7 +111,7 @@ func TestPodTemplateSpecHash(t *testing.T) {
 		specJson := strings.Replace(podSpec, "@@VERSION@@", strconv.Itoa(i), 1)
 		spec := v1.PodTemplateSpec{}
 		json.Unmarshal([]byte(specJson), &spec)
-		hash := GetPodTemplateSpecHash(&spec, nil)
+		hash := controller.ComputeHash(&spec, nil)
 		if v, ok := seenHashes[hash]; ok {
 			t.Errorf("Hash collision, old: %d new: %d", v, i)
 			break
@@ -139,6 +140,6 @@ func BenchmarkFnv(b *testing.B) {
 	json.Unmarshal([]byte(podSpec), &spec)
 
 	for i := 0; i < b.N; i++ {
-		GetPodTemplateSpecHash(&spec, nil)
+		controller.ComputeHash(&spec, nil)
 	}
 }

pkg/controller/deployment/util/pod_util.go

@@ -17,9 +17,6 @@ limitations under the License.
 package util
 
 import (
-	"encoding/binary"
-	"hash/fnv"
-
 	"github.com/golang/glog"
 
 	errorsutil "k8s.io/apimachinery/pkg/util/errors"
@@ -28,23 +25,8 @@ import (
 	v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
 	corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"
 	"k8s.io/kubernetes/pkg/client/retry"
-	hashutil "k8s.io/kubernetes/pkg/util/hash"
 )
 
-func GetPodTemplateSpecHash(template *v1.PodTemplateSpec, uniquifier *int64) uint32 {
-	podTemplateSpecHasher := fnv.New32a()
-	hashutil.DeepHashObject(podTemplateSpecHasher, *template)
-
-	// Add uniquifier in the hash if it exists.
-	if uniquifier != nil {
-		uniquifierBytes := make([]byte, 8)
-		binary.LittleEndian.PutUint64(uniquifierBytes, uint64(*uniquifier))
-		podTemplateSpecHasher.Write(uniquifierBytes)
-	}
-
-	return podTemplateSpecHasher.Sum32()
-}
-
 // TODO: use client library instead when it starts to support update retries
 //       see https://github.com/kubernetes/kubernetes/issues/21479
 type updatePodFunc func(pod *v1.Pod) error

pkg/controller/deployment/util/pod_util_test.go

@@ -1,59 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package util
-
-import (
-	"math"
-	"testing"
-
-	"k8s.io/kubernetes/pkg/api/v1"
-)
-
-func int64P(num int64) *int64 {
-	return &num
-}
-
-func TestGetPodTemplateSpecHash(t *testing.T) {
-	tests := []struct {
-		name                string
-		template            *v1.PodTemplateSpec
-		collisionCount      *int64
-		otherCollisionCount *int64
-	}{
-		{
-			name:                "simple",
-			template:            &v1.PodTemplateSpec{},
-			collisionCount:      int64P(1),
-			otherCollisionCount: int64P(2),
-		},
-		{
-			name:                "using math.MaxInt64",
-			template:            &v1.PodTemplateSpec{},
-			collisionCount:      nil,
-			otherCollisionCount: int64P(int64(math.MaxInt64)),
-		},
-	}
-
-	for _, test := range tests {
-		hash := GetPodTemplateSpecHash(test.template, test.collisionCount)
-		otherHash := GetPodTemplateSpecHash(test.template, test.otherCollisionCount)
-
-		if hash == otherHash {
-			t.Errorf("expected different hashes but got the same: %d", hash)
-		}
-	}
-}

pkg/controller/deployment/util/replicaset_util.go

@@ -28,6 +28,7 @@ import (
 	unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1"
 	extensionslisters "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
 	"k8s.io/kubernetes/pkg/client/retry"
+	"k8s.io/kubernetes/pkg/controller"
 	labelsutil "k8s.io/kubernetes/pkg/util/labels"
 )
 
@@ -76,5 +77,5 @@ func GetReplicaSetHash(rs *extensions.ReplicaSet, uniquifier *int64) (string, er
 	}
 	rsTemplate := template.(v1.PodTemplateSpec)
 	rsTemplate.Labels = labelsutil.CloneAndRemoveLabel(rsTemplate.Labels, extensions.DefaultDeploymentUniqueLabelKey)
-	return fmt.Sprintf("%d", GetPodTemplateSpecHash(&rsTemplate, uniquifier)), nil
+	return fmt.Sprintf("%d", controller.ComputeHash(&rsTemplate, uniquifier)), nil
 }