diff --git a/go.mod b/go.mod index 01e07b0e99..5027b29e16 100644 --- a/go.mod +++ b/go.mod @@ -22,11 +22,11 @@ require ( k8s.io/cli-runtime v0.18.8 k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible k8s.io/code-generator v0.18.12 - knative.dev/eventing v0.19.1-0.20201216081458-3e06c6b996dd + knative.dev/eventing v0.19.1-0.20201216183558-f3468d1c9954 knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 - knative.dev/networking v0.0.0-20201216043058-02ebf9e9b727 - knative.dev/pkg v0.0.0-20201216014558-95b8793bd623 - knative.dev/serving v0.19.1-0.20201216120558-a26cbe38ded4 + knative.dev/networking v0.0.0-20201217015204-ceef42482365 + knative.dev/pkg v0.0.0-20201217014702-b0c121fb667f + knative.dev/serving v0.19.1-0.20201217014702-58258e8d6f8e sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index 8bef6b0c35..946dfb9095 100644 --- a/go.sum +++ b/go.sum @@ -1263,8 +1263,8 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7MpmSnvtrOieolJKoE= k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= knative.dev/caching v0.0.0-20201215015243-9bd909a64850/go.mod h1:/+gGbjPMtb5Jo5PNmmwGNF/WMwTC8cuPG38GPqUqBS8= -knative.dev/eventing v0.19.1-0.20201216081458-3e06c6b996dd h1:5qYvQl79MwwIaFK8FT86CfCgQok3BFBKta8CPbpDaZ0= -knative.dev/eventing v0.19.1-0.20201216081458-3e06c6b996dd/go.mod h1:Zs0qfFfbKDhEM5JHjQtmCXBu9k+GERSfeDwitMtgjQM= +knative.dev/eventing v0.19.1-0.20201216183558-f3468d1c9954 h1:6aNIdsIusWwC2esDUuvzSqyf7hUPohwsX2avcR/q0Kc= +knative.dev/eventing v0.19.1-0.20201216183558-f3468d1c9954/go.mod h1:Zs0qfFfbKDhEM5JHjQtmCXBu9k+GERSfeDwitMtgjQM= knative.dev/hack v0.0.0-20201112185459-01a34c573bd8 h1:RNbZsAjhswBPtl4C5C5gEFX5/GfWIOZQxfYD9DhkHdY= knative.dev/hack v0.0.0-20201112185459-01a34c573bd8/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack v0.0.0-20201118155651-b31d3bb6bff9/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= @@ -1273,19 +1273,20 @@ knative.dev/hack v0.0.0-20201201234937-fddbf732e450/go.mod h1:PHt8x8yX5Z9pPquBEf knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 h1:kIztWfvnIFV8Lhlea02K3YO2mIzcDyQNzrBLn0Oq9sA= knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/networking v0.0.0-20201215172457-b175a8d66f91/go.mod h1:CEC2okV/9UCg2PdXZWZRtEG81/jdbKZ28tfAcc2hAis= -knative.dev/networking v0.0.0-20201216043058-02ebf9e9b727 h1:+cpEP6NL5J7sXY5f5cI29aedUhJ2B9ONxt/al/nkuhs= -knative.dev/networking v0.0.0-20201216043058-02ebf9e9b727/go.mod h1:r2uozAo4RhYquP/yVUP04rVDSs7rBI4fc6ICsonNISg= +knative.dev/networking v0.0.0-20201217015204-ceef42482365 h1:/afRCNB+tOirJ+hWWI4LCU58PZQd0WbaZhMLFp2qe9g= +knative.dev/networking v0.0.0-20201217015204-ceef42482365/go.mod h1:eFbYgJ+mBmsauvUB+Kxn9tXCCdyo/TL1mkZLgJaBJ2c= knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed h1:4LNEFhvD2Ya4WgCD3SC1WGXz81bjEvQgbcpe5XACI3I= knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed/go.mod h1:nxlh3CUvx6WBPr1WKD96AHxFZPD2UKRDo9RUp8ILTyQ= knative.dev/pkg v0.0.0-20201214144644-909c15242675 h1:LoJ/axeH7J8ovl3+uELzmGUZ/hnjHeX7m6tZTrfk/P0= knative.dev/pkg v0.0.0-20201214144644-909c15242675/go.mod h1:9Z5HV80glvuMCv9oJqkWQcYoZrPAw8oA2C5JdFrNk0A= knative.dev/pkg v0.0.0-20201215101243-af53027cbd91/go.mod h1:VjrwVhfEZUnn6FruncHcBm854FldnRpekpyBbYtBvZM= knative.dev/pkg v0.0.0-20201215202458-ef8048c0ba77/go.mod h1:VjrwVhfEZUnn6FruncHcBm854FldnRpekpyBbYtBvZM= -knative.dev/pkg v0.0.0-20201216014558-95b8793bd623 h1:YDt8T3at2oWi33WD3UzbtE9bh+r8iQ0xJijJc7k7nqw= -knative.dev/pkg v0.0.0-20201216014558-95b8793bd623/go.mod h1:VjrwVhfEZUnn6FruncHcBm854FldnRpekpyBbYtBvZM= +knative.dev/pkg v0.0.0-20201216162758-261c9b4624df/go.mod h1:VjrwVhfEZUnn6FruncHcBm854FldnRpekpyBbYtBvZM= +knative.dev/pkg v0.0.0-20201217014702-b0c121fb667f h1:c4fPgRAIlW0uTC2Ec3+AfkA3adPXwfjfA0NhiA/ybgs= +knative.dev/pkg v0.0.0-20201217014702-b0c121fb667f/go.mod h1:VjrwVhfEZUnn6FruncHcBm854FldnRpekpyBbYtBvZM= knative.dev/reconciler-test v0.0.0-20201124190335-83a44efcdfef/go.mod h1:YSs1y1rgnjs8w39/drLIOQbWvZUQwqApvd+EizO8UsA= -knative.dev/serving v0.19.1-0.20201216120558-a26cbe38ded4 h1:ORUzikuA6lxmYYDMSg63NZJPfEX8VJ4yvbs0TAeMDho= -knative.dev/serving v0.19.1-0.20201216120558-a26cbe38ded4/go.mod h1:7uNUzgy9rq77x1F+raxTG3dYTeumb+gHFbCd40SXxdY= +knative.dev/serving v0.19.1-0.20201217014702-58258e8d6f8e h1:JvGdFs4V7yOrPGFYYScXJP9gkXkgLPV1sfgPmZQ47VY= +knative.dev/serving v0.19.1-0.20201217014702-58258e8d6f8e/go.mod h1:7uNUzgy9rq77x1F+raxTG3dYTeumb+gHFbCd40SXxdY= 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/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_defaults.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_defaults.go index 33bc7b7375..74fa47dbe2 100644 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_defaults.go +++ b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_defaults.go @@ -35,9 +35,7 @@ func (is *IngressSpec) SetDefaults(ctx context.Context) { for i := range is.Rules { is.Rules[i].SetDefaults(ctx) } - if is.HTTPOption == "" { - is.HTTPOption = HTTPOptionEnabled - } + // Deprecated, do not use. is.DeprecatedVisibility = "" } diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_types.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_types.go index 7c351a0b57..2daf7bdda1 100644 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_types.go +++ b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_types.go @@ -100,11 +100,6 @@ type IngressSpec struct { // +optional Rules []IngressRule `json:"rules,omitempty"` - // HTTPOption is the option of HTTP. It has the following three values: - // `HTTPOptionEnabled`, `HTTPOptionDisabled`, `HTTPOptionRedirected` - // If it's not specified then it defaults to `HTTPOptionEnabled`. - HTTPOption HTTPOption `json:"httpOption,omitempty"` - // DeprecatedVisibility was used for the fallback when spec.rules.visibility // isn't set. // @@ -114,18 +109,6 @@ type IngressSpec struct { DeprecatedVisibility IngressVisibility `json:"visibility,omitempty"` } -type HTTPOption string - -const ( - // The knative ingress will be able to serve HTTP connections. - HTTPOptionEnabled HTTPOption = "Enabled" - // The knative ingress will reject HTTP traffic - HTTPOptionDisabled HTTPOption = "Disabled" - // The knative will return redirection HTTP status for the clients, - // asking the clients to redirect their requests to HTTPS. - HTTPOptionRedirected HTTPOption = "Redirected" -) - // IngressVisibility describes whether the Ingress should be exposed to // public gateways or not. type IngressVisibility string diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_validation.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_validation.go index baee875cf4..1e3e43210d 100644 --- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_validation.go +++ b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_validation.go @@ -50,7 +50,6 @@ func (is *IngressSpec) Validate(ctx context.Context) *apis.FieldError { for idx, tls := range is.TLS { all = all.Also(tls.Validate(ctx).ViaFieldIndex("tls", idx)) } - all = all.Also(is.HTTPOption.Validate(ctx)) return all } @@ -167,14 +166,3 @@ func (t *IngressTLS) Validate(ctx context.Context) *apis.FieldError { } return all } - -// Validate inspects and validates HTTPOption object. -func (t HTTPOption) Validate(ctx context.Context) (all *apis.FieldError) { - switch t { - case HTTPOptionEnabled, HTTPOptionDisabled, HTTPOptionRedirected: - break - default: - all = all.Also(apis.ErrInvalidValue(t, "httpOption")) - } - return all -} diff --git a/vendor/knative.dev/pkg/controller/controller.go b/vendor/knative.dev/pkg/controller/controller.go index 941117c71d..341e4ab2d3 100644 --- a/vendor/knative.dev/pkg/controller/controller.go +++ b/vendor/knative.dev/pkg/controller/controller.go @@ -26,6 +26,7 @@ import ( "github.com/google/uuid" "go.uber.org/zap" + "go.uber.org/zap/zapcore" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" @@ -265,9 +266,12 @@ func (c *Impl) EnqueueAfter(obj interface{}, after time.Duration) { // and enqueues that key in the slow lane. func (c *Impl) EnqueueSlowKey(key types.NamespacedName) { c.workQueue.SlowLane().Add(key) - c.logger.With(zap.String(logkey.Key, key.String())). - Debugf("Adding to the slow queue %s (depth(total/slow): %d/%d)", - safeKey(key), c.workQueue.Len(), c.workQueue.SlowLane().Len()) + + if logger := c.logger.Desugar(); logger.Core().Enabled(zapcore.DebugLevel) { + logger.Debug(fmt.Sprintf("Adding to the slow queue %s (depth(total/slow): %d/%d)", + safeKey(key), c.workQueue.Len(), c.workQueue.SlowLane().Len()), + zap.String(logkey.Key, key.String())) + } } // EnqueueSlow extracts namespaced name from the object and enqueues it on the slow @@ -393,8 +397,11 @@ func (c *Impl) EnqueueNamespaceOf(obj interface{}) { // EnqueueKey takes a namespace/name string and puts it onto the work queue. func (c *Impl) EnqueueKey(key types.NamespacedName) { c.workQueue.Add(key) - c.logger.With(zap.String(logkey.Key, key.String())). - Debugf("Adding to queue %s (depth: %d)", safeKey(key), c.workQueue.Len()) + + if logger := c.logger.Desugar(); logger.Core().Enabled(zapcore.DebugLevel) { + logger.Debug(fmt.Sprintf("Adding to queue %s (depth: %d)", safeKey(key), c.workQueue.Len()), + zap.String(logkey.Key, key.String())) + } } // MaybeEnqueueBucketKey takes a Bucket and namespace/name string and puts it onto @@ -409,8 +416,11 @@ func (c *Impl) MaybeEnqueueBucketKey(bkt reconciler.Bucket, key types.Namespaced // the work queue after given delay. func (c *Impl) EnqueueKeyAfter(key types.NamespacedName, delay time.Duration) { c.workQueue.AddAfter(key, delay) - c.logger.With(zap.String(logkey.Key, key.String())). - Debugf("Adding to queue %s (delay: %v, depth: %d)", safeKey(key), delay, c.workQueue.Len()) + + if logger := c.logger.Desugar(); logger.Core().Enabled(zapcore.DebugLevel) { + logger.Debug(fmt.Sprintf("Adding to queue %s (delay: %v, depth: %d)", safeKey(key), delay, c.workQueue.Len()), + zap.String(logkey.Key, key.String())) + } } // RunContext starts the controller's worker threads, the number of which is threadiness. diff --git a/vendor/knative.dev/pkg/logging/config.go b/vendor/knative.dev/pkg/logging/config.go index 1effe1b35b..7e8636f9b6 100644 --- a/vendor/knative.dev/pkg/logging/config.go +++ b/vendor/knative.dev/pkg/logging/config.go @@ -195,8 +195,8 @@ func UpdateLevelFromConfigMap(logger *zap.SugaredLogger, atomicLevel zap.AtomicL case errors.Is(err, errEmptyLoggerConfig): level = zap.NewAtomicLevel().Level() case err != nil: - logger.With(zap.Error(err)).Errorf("Failed to parse logger configuration. "+ - "Previous log level retained for %v", levelKey) + logger.Errorw("Failed to parse logger configuration. Previous log level retained for "+levelKey, + zap.Error(err)) return default: level = loggingCfg.Level.Level() diff --git a/vendor/modules.txt b/vendor/modules.txt index 226aec322d..4e64df97fe 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -849,7 +849,7 @@ k8s.io/kube-openapi/pkg/util/sets k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# knative.dev/eventing v0.19.1-0.20201216081458-3e06c6b996dd +# knative.dev/eventing v0.19.1-0.20201216183558-f3468d1c9954 ## explicit knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/configs @@ -882,12 +882,12 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1alpha2/fake # knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 ## explicit knative.dev/hack -# knative.dev/networking v0.0.0-20201216043058-02ebf9e9b727 +# knative.dev/networking v0.0.0-20201217015204-ceef42482365 ## explicit knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 -# knative.dev/pkg v0.0.0-20201216014558-95b8793bd623 +# knative.dev/pkg v0.0.0-20201217014702-b0c121fb667f ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -931,7 +931,7 @@ knative.dev/pkg/tracing/config knative.dev/pkg/tracing/propagation knative.dev/pkg/tracing/propagation/tracecontextb3 knative.dev/pkg/tracker -# knative.dev/serving v0.19.1-0.20201216120558-a26cbe38ded4 +# knative.dev/serving v0.19.1-0.20201217014702-58258e8d6f8e ## explicit knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1