From f15ce04f0dbcd9115bc954ea623855632d9fc5b6 Mon Sep 17 00:00:00 2001 From: David Eads Date: Wed, 22 Nov 2017 10:46:37 -0500 Subject: [PATCH 1/2] UPSTREAM: 56221: log errors while trying to GC resources --- .../pkg/controller/garbagecollector/garbagecollector.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go b/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go index a109ff880d22..544b3b57784b 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go @@ -463,14 +463,14 @@ func (gc *GarbageCollector) attemptToOrphanWorker() bool { err := gc.orphanDependents(owner.identity, dependents) if err != nil { - glog.V(5).Infof("orphanDependents for %s failed with %v", owner.identity, err) + utilruntime.HandleError(fmt.Errorf("orphanDependents for %s failed with %v", owner.identity, err)) gc.attemptToOrphan.AddRateLimited(item) return true } // update the owner, remove "orphaningFinalizer" from its finalizers list err = gc.removeFinalizer(owner, metav1.FinalizerOrphanDependents) if err != nil { - glog.V(5).Infof("removeOrphanFinalizer for %s failed with %v", owner.identity, err) + utilruntime.HandleError(fmt.Errorf("removeOrphanFinalizer for %s failed with %v", owner.identity, err)) gc.attemptToOrphan.AddRateLimited(item) } return true From 8a1912a03ef6577cdd3bf348dca3fed83fc29d5e Mon Sep 17 00:00:00 2001 From: David Eads Date: Wed, 22 Nov 2017 11:00:47 -0500 Subject: [PATCH 2/2] UPSTREAM: 56223: ensure that network policy can be GC'd --- .../kubernetes/pkg/apis/extensions/validation/validation.go | 3 +-- .../kubernetes/pkg/apis/networking/validation/validation.go | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go b/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go index 4be86af92ddf..956067c4c209 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go @@ -19,7 +19,6 @@ package validation import ( "fmt" "net" - "reflect" "regexp" "strconv" "strings" @@ -998,7 +997,7 @@ func ValidateNetworkPolicy(np *extensions.NetworkPolicy) field.ErrorList { func ValidateNetworkPolicyUpdate(update, old *extensions.NetworkPolicy) field.ErrorList { allErrs := field.ErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&update.ObjectMeta, &old.ObjectMeta, field.NewPath("metadata"))...) - if !reflect.DeepEqual(update.Spec, old.Spec) { + if !apiequality.Semantic.DeepEqual(update.Spec, old.Spec) { allErrs = append(allErrs, field.Forbidden(field.NewPath("spec"), "updates to networkpolicy spec are forbidden.")) } return allErrs diff --git a/vendor/k8s.io/kubernetes/pkg/apis/networking/validation/validation.go b/vendor/k8s.io/kubernetes/pkg/apis/networking/validation/validation.go index e2db31430fe8..fa26b1635732 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/networking/validation/validation.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/networking/validation/validation.go @@ -17,8 +17,7 @@ limitations under the License. package validation import ( - "reflect" - + apiequality "k8s.io/apimachinery/pkg/api/equality" unversionedvalidation "k8s.io/apimachinery/pkg/apis/meta/v1/validation" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/validation" @@ -92,7 +91,7 @@ func ValidateNetworkPolicy(np *networking.NetworkPolicy) field.ErrorList { func ValidateNetworkPolicyUpdate(update, old *networking.NetworkPolicy) field.ErrorList { allErrs := field.ErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&update.ObjectMeta, &old.ObjectMeta, field.NewPath("metadata"))...) - if !reflect.DeepEqual(update.Spec, old.Spec) { + if !apiequality.Semantic.DeepEqual(update.Spec, old.Spec) { allErrs = append(allErrs, field.Forbidden(field.NewPath("spec"), "updates to networkpolicy spec are forbidden.")) } return allErrs