scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 19:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ObjectMetaAndSpecEquivalent in federation controllers

Browse Source
This commit is contained in:
Marcin Wielgus
2016-10-12 14:08:35 +02:00
parent ea5afb9ab7
commit 6cafcc0c02
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/namespace/namespace_controller.go
View File

@@ -18,7 +18,6 @@ package namespace
import (
"fmt"
"reflect"
"time"
federation_api "k8s.io/kubernetes/federation/apis/federation/v1beta1"
@@ -289,8 +288,7 @@ func (nc *NamespaceController) reconcileNamespace(namespace string) {
clusterNamespace := clusterNamespaceObj.(*api_v1.Namespace)
// Update existing namespace, if needed.
if !util.ObjectMetaEquivalent(desiredNamespace.ObjectMeta, clusterNamespace.ObjectMeta) ||
!reflect.DeepEqual(desiredNamespace.Spec, clusterNamespace.Spec) {
if !util.ObjectMetaAndSpecEquivalent(desiredNamespace, clusterNamespace) {
nc.eventRecorder.Eventf(baseNamespace, api.EventTypeNormal, "UpdateInCluster",
"Updating namespace in cluster %s", cluster.Name)