github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +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
commit 7d8c0fa0c9
4 changed files with 4 additions and 12 deletions
Show Stats 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" "bytes"
"encoding/json" "encoding/json"
"fmt" "fmt"
"reflect"
"sort" "sort"
"time" "time"
@ -489,8 +488,7 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation
currentLd := ldObj.(*extensionsv1.Deployment) currentLd := ldObj.(*extensionsv1.Deployment)
// Update existing replica set, if needed. // Update existing replica set, if needed.
if !fedutil.ObjectMetaEquivalent(ld.ObjectMeta, currentLd.ObjectMeta) || if !fedutil.ObjectMetaAndSpecEquivalent(ld, currentLd) {
!reflect.DeepEqual(ld.Spec, currentLd.Spec) {
fdc.eventRecorder.Eventf(fd, api.EventTypeNormal, "UpdateInCluster", fdc.eventRecorder.Eventf(fd, api.EventTypeNormal, "UpdateInCluster",
"Updating deployment in cluster %s", clusterName) "Updating deployment in cluster %s", clusterName)

4
federation/pkg/federation-controller/ingress/ingress_controller.go
View File

@ -18,7 +18,6 @@ package ingress
import ( import (
"fmt" "fmt"
"reflect"
"sync" "sync"
"time" "time"
@ -711,8 +710,7 @@ func (ic *IngressController) reconcileIngress(ingress types.NamespacedName) {
glog.V(4).Infof(logStr, "Not transferring") glog.V(4).Infof(logStr, "Not transferring")
} }
// Update existing cluster ingress, if needed. // Update existing cluster ingress, if needed.
if util.ObjectMetaEquivalent(baseIngress.ObjectMeta, clusterIngress.ObjectMeta) && if util.ObjectMetaAndSpecEquivalent(baseIngress, clusterIngress) {
reflect.DeepEqual(baseIngress.Spec, clusterIngress.Spec) {
glog.V(4).Infof("Ingress %q in cluster %q does not need an update: cluster ingress is equivalent to federated ingress", ingress, cluster.Name) glog.V(4).Infof("Ingress %q in cluster %q does not need an update: cluster ingress is equivalent to federated ingress", ingress, cluster.Name)
} else { } else {
glog.V(4).Infof("Ingress %s in cluster %s needs an update: cluster ingress %v is not equivalent to federated ingress %v", ingress, cluster.Name, clusterIngress, desiredIngress) glog.V(4).Infof("Ingress %s in cluster %s needs an update: cluster ingress %v is not equivalent to federated ingress %v", ingress, cluster.Name, clusterIngress, desiredIngress)

4
federation/pkg/federation-controller/namespace/namespace_controller.go
View File

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

4
federation/pkg/federation-controller/replicaset/replicasetcontroller.go
View File

@ -20,7 +20,6 @@ import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt" "fmt"
"reflect"
"sort" "sort"
"time" "time"
@ -486,8 +485,7 @@ func (frsc *ReplicaSetController) reconcileReplicaSet(key string) (reconciliatio
} else { } else {
currentLrs := lrsObj.(*extensionsv1.ReplicaSet) currentLrs := lrsObj.(*extensionsv1.ReplicaSet)
// Update existing replica set, if needed. // Update existing replica set, if needed.
if !fedutil.ObjectMetaEquivalent(lrs.ObjectMeta, currentLrs.ObjectMeta) || if !fedutil.ObjectMetaAndSpecEquivalent(lrs, currentLrs) {
!reflect.DeepEqual(lrs.Spec, currentLrs.Spec) {
frsc.eventRecorder.Eventf(frs, api.EventTypeNormal, "UpdateInCluster", frsc.eventRecorder.Eventf(frs, api.EventTypeNormal, "UpdateInCluster",
"Updating replicaset in cluster %s", clusterName) "Updating replicaset in cluster %s", clusterName)