github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-28 20:30:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34609 from mwielgus/usespecandmeta

Browse Source 
Automatic merge from submit-queue

Use ObjectMetaAndSpecEquivalent in federation controllers

Use util added in #34561.

cc: @quinton-hoole
This commit is contained in:
Kubernetes Submit Queue
2016-10-12 10:16:00 -07:00
committed by GitHub
parent aadd5ac80b 6cafcc0c02
commit 7d8c0fa0c9
4 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
federation/pkg/federation-controller/deployment/deploymentcontroller.go
View File

@@ -20,7 +20,6 @@ import (
"bytes"
"encoding/json"
"fmt"
"reflect"
"sort"
"time"
@@ -489,8 +488,7 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation
currentLd := ldObj.(*extensionsv1.Deployment)
// Update existing replica set, if needed.
if !fedutil.ObjectMetaEquivalent(ld.ObjectMeta, currentLd.ObjectMeta) ||
!reflect.DeepEqual(ld.Spec, currentLd.Spec) {
if !fedutil.ObjectMetaAndSpecEquivalent(ld, currentLd) {
fdc.eventRecorder.Eventf(fd, api.EventTypeNormal, "UpdateInCluster",
"Updating deployment in cluster %s", clusterName)