github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Update to use Semantic.DeepEqual in regsitry

Browse Source
This commit is contained in:
Shiyang Wang
2017-04-23 14:52:05 +08:00
parent c289286647
commit 34a114f6a9
14 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/registry/core/replicationcontroller/BUILD
View File

@@ -20,6 +20,7 @@ go_library(
"//pkg/api:go_default_library",
"//pkg/api/helper:go_default_library",
"//pkg/api/validation:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",

6
pkg/registry/core/replicationcontroller/strategy.go
View File

@@ -20,10 +20,10 @@ package replicationcontroller
import (
"fmt"
"reflect"
"strconv"
"strings"
apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
@@ -81,7 +81,7 @@ func (rcStrategy) PrepareForUpdate(ctx genericapirequest.Context, obj, old runti
// status its own object, and even if we don't, writes may be the result of a
// read-update-write loop, so the contents of spec may not actually be the spec that
// the controller has *seen*.
if !reflect.DeepEqual(oldController.Spec, newController.Spec) {
if !apiequality.Semantic.DeepEqual(oldController.Spec, newController.Spec) {
newController.Generation = oldController.Generation + 1
}
}
@@ -120,7 +120,7 @@ func (rcStrategy) ValidateUpdate(ctx genericapirequest.Context, obj, old runtime
switch {
case strings.Contains(brokenField, "selector"):
if !reflect.DeepEqual(oldRc.Spec.Selector, newRc.Spec.Selector) {
if !apiequality.Semantic.DeepEqual(oldRc.Spec.Selector, newRc.Spec.Selector) {
errs = append(errs, field.Invalid(field.NewPath("spec").Child("selector"), newRc.Spec.Selector, "cannot update non-convertible selector"))
}
default: