diff --git a/go.mod b/go.mod index d346a168..c6761cbe 100644 --- a/go.mod +++ b/go.mod @@ -18,6 +18,6 @@ require ( k8s.io/client-go v0.19.7 k8s.io/code-generator v0.19.7 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 - knative.dev/hack v0.0.0-20210325223819-b6ab329907d3 - knative.dev/pkg v0.0.0-20210422210038-0c5259d6504d + knative.dev/hack v0.0.0-20210423193138-b5f6e2587f6d + knative.dev/pkg v0.0.0-20210423162638-78b8140ed19c ) diff --git a/go.sum b/go.sum index f204aeb4..0d0fc355 100644 --- a/go.sum +++ b/go.sum @@ -1220,8 +1220,10 @@ k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= knative.dev/hack v0.0.0-20210325223819-b6ab329907d3 h1:km0Rrh0T9/wA2pivQm1hqSPVwgNgGCHC2WNn3GakZmE= knative.dev/hack v0.0.0-20210325223819-b6ab329907d3/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/pkg v0.0.0-20210422210038-0c5259d6504d h1:ilIOXb2KfleKeW/JXqcoQK/BKi3D4X8HVmrKYek32Go= -knative.dev/pkg v0.0.0-20210422210038-0c5259d6504d/go.mod h1:UtcSLHy2XIz5blWoPTA40F87zk4O7erxkCwv+7Tsmws= +knative.dev/hack v0.0.0-20210423193138-b5f6e2587f6d h1:DnJOozMA1X0O+l69LYjW3+Lx3jI1+SLZkRgMm6CrKJA= +knative.dev/hack v0.0.0-20210423193138-b5f6e2587f6d/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/pkg v0.0.0-20210423162638-78b8140ed19c h1:sZw/k9V4Gyync9z9fpTvM/kIXIF8ciKVx8T144e7MzY= +knative.dev/pkg v0.0.0-20210423162638-78b8140ed19c/go.mod h1:UtcSLHy2XIz5blWoPTA40F87zk4O7erxkCwv+7Tsmws= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/pkg/client/injection/reconciler/caching/v1alpha1/image/reconciler.go b/pkg/client/injection/reconciler/caching/v1alpha1/image/reconciler.go index 3f8a5ee6..9962fd53 100644 --- a/pkg/client/injection/reconciler/caching/v1alpha1/image/reconciler.go +++ b/pkg/client/injection/reconciler/caching/v1alpha1/image/reconciler.go @@ -22,7 +22,6 @@ import ( context "context" json "encoding/json" fmt "fmt" - reflect "reflect" zap "go.uber.org/zap" v1 "k8s.io/api/core/v1" @@ -329,7 +328,7 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, existing *v1alpha1.Im } // If there's nothing to update, just return. - if reflect.DeepEqual(existing.Status, desired.Status) { + if equality.Semantic.DeepEqual(existing.Status, desired.Status) { return nil } diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_reconciler.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_reconciler.go index 5bbb0cef..e239bf64 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_reconciler.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_reconciler.go @@ -167,7 +167,6 @@ func (g *reconcilerReconcilerGenerator) GenerateType(c *generator.Context, t *ty Name: "SafeDiff", }), "fmtErrorf": c.Universe.Package("fmt").Function("Errorf"), - "reflectDeepEqual": c.Universe.Package("reflect").Function("DeepEqual"), "equalitySemantic": c.Universe.Package("k8s.io/apimachinery/pkg/api/equality").Variable("Semantic"), "jsonMarshal": c.Universe.Package("encoding/json").Function("Marshal"), "typesMergePatchType": c.Universe.Package("k8s.io/apimachinery/pkg/types").Constant("MergePatchType"), @@ -545,7 +544,7 @@ func (r *reconcilerImpl) updateStatus(ctx {{.contextContext|raw}}, existing *{{. } // If there's nothing to update, just return. - if {{.reflectDeepEqual|raw}}(existing.Status, desired.Status) { + if {{.equalitySemantic|raw}}.DeepEqual(existing.Status, desired.Status) { return nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index 33b86bdf..3d5015ce 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -662,10 +662,10 @@ k8s.io/kube-openapi/pkg/util/sets k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# knative.dev/hack v0.0.0-20210325223819-b6ab329907d3 +# knative.dev/hack v0.0.0-20210423193138-b5f6e2587f6d ## explicit knative.dev/hack -# knative.dev/pkg v0.0.0-20210422210038-0c5259d6504d +# knative.dev/pkg v0.0.0-20210423162638-78b8140ed19c ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck