From 8731c54cd3584e8e6955ce35c1b88756607694f7 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Wed, 11 Aug 2021 00:41:59 -0700 Subject: [PATCH] upgrade to latest dependencies (#94) bumping knative.dev/eventing-kafka 84628fc...ee98e74: > ee98e74 upgrade to latest dependencies (# 801) bumping knative.dev/client fc7e876...035150e: > 035150e update versions to 0.25 (# 1425) > 9f30eba upgrade to latest dependencies (# 1424) > 28a340c Prepare changelog and version for 0.25 release (# 1423) > ce790b4 Adding --tls option to domain create command (# 1419) > 4691210 Deprecate `lookup-path` option and updated relevant documentation (# 1422) > f8a8284 look up plugins on PATH by default (# 1412) > fe9edcc upgrade to latest dependencies (# 1417) Signed-off-by: Knative Automation --- go.mod | 4 +-- go.sum | 25 +++++++------------ .../client/pkg/kn/config/config.go | 13 ++++------ .../knative.dev/client/pkg/kn/config/types.go | 13 +++++----- .../client/pkg/serving/v1alpha1/client.go | 9 +++++++ .../apis/autoscaling/annotation_validation.go | 7 +++--- .../serving/pkg/apis/autoscaling/register.go | 5 ++++ vendor/modules.txt | 8 +++--- 8 files changed, 44 insertions(+), 40 deletions(-) diff --git a/go.mod b/go.mod index b6ac4848d..b5b403454 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( gotest.tools/v3 v3.0.3 k8s.io/apimachinery v0.20.7 k8s.io/client-go v0.20.7 - knative.dev/client v0.24.1-0.20210809192512-fc7e87667ff0 - knative.dev/eventing-kafka v0.24.1-0.20210809151812-84628fccee83 + knative.dev/client v0.24.1-0.20210811011859-035150ec4cbf + knative.dev/eventing-kafka v0.25.0 knative.dev/hack v0.0.0-20210622141627-e28525d8d260 knative.dev/pkg v0.0.0-20210803160015-21eb4c167cc5 ) diff --git a/go.sum b/go.sum index 3c9294629..c1a5f825e 100644 --- a/go.sum +++ b/go.sum @@ -1167,7 +1167,6 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= @@ -1831,40 +1830,34 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ= k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= knative.dev/caching v0.0.0-20210215030244-1212288570f0/go.mod h1:rAPalJe9Lx3jHffJpackk5WjZYl3j2QvXUgw0GPllxQ= -knative.dev/caching v0.0.0-20210802062443-6947bb32bc1e/go.mod h1:cda8/bsmlqRKgHdsFWKjEl56Bw/2nNxmHnoJ14c7WDo= +knative.dev/caching v0.0.0-20210803185815-4e553d2275a0/go.mod h1:Vs+HND39+KKaIQp9M3m3Jmt4YtznpitDQ3n53gxbDYQ= knative.dev/client v0.21.0/go.mod h1:1En9uxMhk62EReWR1d66/d3tnpkot/D3vBRfmuidFNc= -knative.dev/client v0.24.1-0.20210809192512-fc7e87667ff0 h1:bcR00/MouJjw6bNwkW+LNykPW5JubSkQdFykebiyZIY= -knative.dev/client v0.24.1-0.20210809192512-fc7e87667ff0/go.mod h1:/fkwl25Ajg2wUg46cpgyhj4E6Ga1nRrczu3tagDB8So= +knative.dev/client v0.24.1-0.20210811011859-035150ec4cbf h1:HmQo6ys1Y9Ys4ky96lIetzZgJxKNdnNa4BdS+fXYTTI= +knative.dev/client v0.24.1-0.20210811011859-035150ec4cbf/go.mod h1:eK9J+6yraHq3CU/8uYgwNWTRFPRkEKFYyG7mUKHpZUo= knative.dev/control-protocol v0.0.0-20210803191615-72cde96b9f5a/go.mod h1:9gYmAq6zVKUA+p1+DXslH91jtga5q2z+YJWcH+z88EE= knative.dev/eventing v0.21.0/go.mod h1:JjbVEOTJJHqo9CTxbTfrMn018hG8fOr3UfBoCJ7KWaA= -knative.dev/eventing v0.24.1-0.20210803173815-5c7b55336efd/go.mod h1:mYN9AeU95zB9QT9ATmYiq0i7k41u69xD0jW1udHdPrc= -knative.dev/eventing v0.24.1-0.20210806092320-e7445c5583e7 h1:qdFn+2z9djrKb4KkpAzB6CCzMcWKeOJ3MqugIL3Jgg0= -knative.dev/eventing v0.24.1-0.20210806092320-e7445c5583e7/go.mod h1:mYN9AeU95zB9QT9ATmYiq0i7k41u69xD0jW1udHdPrc= -knative.dev/eventing-kafka v0.24.1-0.20210809151812-84628fccee83 h1:EL2ZGNZyvqSfrOXKcHcGiVVNXBUhOblgDavxX5qy29w= -knative.dev/eventing-kafka v0.24.1-0.20210809151812-84628fccee83/go.mod h1:uoh1d+MqTuQCn4XXMn8mtyKbxNWDcOkYKya56eGUqgo= +knative.dev/eventing v0.25.0 h1:lBKgQFGvyeUyvf+HOyuxFd5cXx+SMqnzqtPi2hXiCi4= +knative.dev/eventing v0.25.0/go.mod h1:8jIsrnSONPgv+m63OTzpwZQJiQASYl77C3llCyYlBMU= +knative.dev/eventing-kafka v0.25.0 h1:iSwdeBOBApSRSjPdazAUYHd+WjtMXu5SjcGKyltjcD4= +knative.dev/eventing-kafka v0.25.0/go.mod h1:S2sHUoblcRTUzDRm4NX0gTYWcuoAA4LO+ax4uYm8iRM= knative.dev/hack v0.0.0-20210203173706-8368e1f6eacf/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack v0.0.0-20210622141627-e28525d8d260 h1:f2eMtOubAOc/Q7JlvFPDKXiPlJVK+VpX2Cot8hRzCgQ= knative.dev/hack v0.0.0-20210622141627-e28525d8d260/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack/schema v0.0.0-20210622141627-e28525d8d260/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= knative.dev/networking v0.0.0-20210215030235-088986a1c2a3/go.mod h1:pmAMQjMqQUxpK0UyjE71KljMs6rwDMVIAlvrZsU3I6Y= knative.dev/networking v0.0.0-20210216014426-94bfc013982b/go.mod h1:Crdn87hxdFd3Jj6PIyrjzGnr8OGHX35k5xo9jlOrjjA= -knative.dev/networking v0.0.0-20210802043343-0f2f50944c03/go.mod h1:slkQfBEF/qlCfVlifxa6G25XBa0MxDfLcRLxwnCtv0c= knative.dev/networking v0.0.0-20210803181815-acdfd41c575c h1:7G6TQr7ZyIHx35Dn5zuNKUDhlly3KkFxgrKLXeKmjj8= knative.dev/networking v0.0.0-20210803181815-acdfd41c575c/go.mod h1:UA9m1M3rGssy63gVwjSh7CYoWTKZNO8cnY9QsIu7tyo= knative.dev/pkg v0.0.0-20210212203835-448ae657fb5f/go.mod h1:TJSdebQOWX5N2bszohOYVi0H1QtXbtlYLuMghAFBMhY= knative.dev/pkg v0.0.0-20210215165523-84c98f3c3e7a/go.mod h1:TJSdebQOWX5N2bszohOYVi0H1QtXbtlYLuMghAFBMhY= knative.dev/pkg v0.0.0-20210216013737-584933f8280b/go.mod h1:TJSdebQOWX5N2bszohOYVi0H1QtXbtlYLuMghAFBMhY= -knative.dev/pkg v0.0.0-20210713175550-7d1b0f19ef71/go.mod h1:d06VsGUT2grnlhA8GcUjsoePok8P859AYcIqWISMGtY= -knative.dev/pkg v0.0.0-20210731072840-64ab22bbaab9/go.mod h1:NYZRIPU+Pv39VfbZV1BtMIe4kCavNle1udsPrvOLm+Y= -knative.dev/pkg v0.0.0-20210803032247-552bbc106170/go.mod h1:NYZRIPU+Pv39VfbZV1BtMIe4kCavNle1udsPrvOLm+Y= knative.dev/pkg v0.0.0-20210803160015-21eb4c167cc5 h1:jpOTmAXg1oLS8u5HPBrFP1XsOSFCQIvlTRxP8TDGg2E= knative.dev/pkg v0.0.0-20210803160015-21eb4c167cc5/go.mod h1:RPk5txNA3apR9X40D4MpUOP9/VqOG8CrtABWfOwGVS4= knative.dev/reconciler-test v0.0.0-20210216030508-77f50054d024/go.mod h1:RP/K5xJylB72Go6eAsXYEsQHp4zCCNMNjmsqhvq7wko= -knative.dev/reconciler-test v0.0.0-20210714231231-91e5b206e1d5/go.mod h1:Zp2WHfJuh6+rOpOAq78My82drT4Bxjm/K4etmKcA7ko= knative.dev/reconciler-test v0.0.0-20210803183715-b61cc77c06f6/go.mod h1:+Kovy+G5zXZNcuO/uB+zfo37vFKZzsLIlWezt/nKMz0= knative.dev/serving v0.21.0/go.mod h1:PU9k1Y6YMG27XQldEu5agNkcebvSafUXKXPircQYCsE= -knative.dev/serving v0.24.1-0.20210803152115-ac8d05d5cebd h1:YCRAI7VGEJJQELb1foB0zTmxXrh6jA+ohzumTQKixyI= -knative.dev/serving v0.24.1-0.20210803152115-ac8d05d5cebd/go.mod h1:PIiHlCNPwKSh2JgDfa+A9qwA/bFo7WeAT6bieWQGAPM= +knative.dev/serving v0.25.0 h1:YdIdW7CSJ53xbVp5D6dZmXccFnQ6PiR+U/GiwujhwIc= +knative.dev/serving v0.25.0/go.mod h1:24E4fVyViFnz8aAaafzdrYKB7CAsQr4FMU7QXoIE6CI= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/vendor/knative.dev/client/pkg/kn/config/config.go b/vendor/knative.dev/client/pkg/kn/config/config.go index 9a5f62a7f..2b73695ca 100644 --- a/vendor/knative.dev/client/pkg/kn/config/config.go +++ b/vendor/knative.dev/client/pkg/kn/config/config.go @@ -71,11 +71,8 @@ func (c *config) PluginsDir() string { // LookupPluginsInPath returns true if plugins should be also checked in the pat func (c *config) LookupPluginsInPath() bool { - if viper.IsSet(keyPluginsLookupInPath) { - return viper.GetBool(keyPluginsLookupInPath) - } else if viper.IsSet(legacyKeyPluginsLookupInPath) { - // Remove that branch if legacy option is switched off - return viper.GetBool(legacyKeyPluginsLookupInPath) + if viper.IsSet(deprecatedKeyPluginsLookupInPath) { + return viper.GetBool(deprecatedKeyPluginsLookupInPath) } else { // If legacy branch is removed, switch to setting the default to viper // See TODO comment below. @@ -117,7 +114,7 @@ func BootstrapConfig() error { if err != nil { return err } - err = viper.BindPFlag(keyPluginsLookupInPath, bootstrapFlagSet.Lookup(flagPluginsLookupInPath)) + err = viper.BindPFlag(deprecatedKeyPluginsLookupInPath, bootstrapFlagSet.Lookup(flagPluginsLookupInPath)) if err != nil { return err } @@ -140,7 +137,7 @@ func BootstrapConfig() error { // TODO: Re-enable when legacy handling for plugin config has been removed // For now default handling is happening directly in the getter of GlobalConfig // viper.SetDefault(keyPluginsDirectory, bootstrapDefaults.pluginsDir) - // viper.SetDefault(keyPluginsLookupInPath, bootstrapDefaults.lookupPluginsInPath) + // viper.SetDefault(deprecatedKeyPluginsLookupInPath, bootstrapDefaults.lookupPluginsInPath) // If a config file is found, read it in. err = viper.ReadInConfig() @@ -178,7 +175,7 @@ func initDefaults() *defaultConfig { return &defaultConfig{ configFile: defaultConfigLocation("config.yaml"), pluginsDir: defaultConfigLocation("plugins"), - lookupPluginsInPath: false, + lookupPluginsInPath: true, } } diff --git a/vendor/knative.dev/client/pkg/kn/config/types.go b/vendor/knative.dev/client/pkg/kn/config/types.go index 0253ff710..b801c58dd 100644 --- a/vendor/knative.dev/client/pkg/kn/config/types.go +++ b/vendor/knative.dev/client/pkg/kn/config/types.go @@ -70,17 +70,16 @@ type ChannelTypeMapping struct { // config Keys for looking up in viper const ( - keyPluginsDirectory = "plugins.directory" - keyPluginsLookupInPath = "plugins.path-lookup" - keySinkMappings = "eventing.sink-mappings" - keyChannelTypeMappings = "eventing.channel-type-mappings" + keyPluginsDirectory = "plugins.directory" + deprecatedKeyPluginsLookupInPath = "plugins.path-lookup" + keySinkMappings = "eventing.sink-mappings" + keyChannelTypeMappings = "eventing.channel-type-mappings" ) // legacy config keys, deprecated const ( - legacyKeyPluginsDirectory = "plugins-dir" - legacyKeyPluginsLookupInPath = "lookup-plugins" - legacyKeySinkMappings = "sink" + legacyKeyPluginsDirectory = "plugins-dir" + legacyKeySinkMappings = "sink" ) // Global (hidden) flags diff --git a/vendor/knative.dev/client/pkg/serving/v1alpha1/client.go b/vendor/knative.dev/client/pkg/serving/v1alpha1/client.go index 262e9b056..79a06f0c3 100644 --- a/vendor/knative.dev/client/pkg/serving/v1alpha1/client.go +++ b/vendor/knative.dev/client/pkg/serving/v1alpha1/client.go @@ -160,6 +160,15 @@ func (b *DomainMappingBuilder) Reference(reference duckv1.KReference) *DomainMap return b } +// TLS for domainMapping builder +func (b *DomainMappingBuilder) TLS(cert string) *DomainMappingBuilder { + if cert == "" { + return b + } + b.domainMapping.Spec.TLS = &servingv1alpha1.SecretTLS{SecretName: cert} + return b +} + // Build to return an instance of domainMapping object func (b *DomainMappingBuilder) Build() *servingv1alpha1.DomainMapping { return b.domainMapping diff --git a/vendor/knative.dev/serving/pkg/apis/autoscaling/annotation_validation.go b/vendor/knative.dev/serving/pkg/apis/autoscaling/annotation_validation.go index 3fdf2bb6a..aebcf0547 100644 --- a/vendor/knative.dev/serving/pkg/apis/autoscaling/annotation_validation.go +++ b/vendor/knative.dev/serving/pkg/apis/autoscaling/annotation_validation.go @@ -158,8 +158,9 @@ func validateLastPodRetention(annotations map[string]string) *apis.FieldError { func validateWindow(annotations map[string]string) *apis.FieldError { if w, ok := annotations[WindowAnnotationKey]; ok { - if annotations[ClassAnnotationKey] == HPA && annotations[MetricAnnotationKey] == CPU { - return apis.ErrInvalidKeyName(WindowAnnotationKey, apis.CurrentField, fmt.Sprintf("%s for %s %s", HPA, MetricAnnotationKey, CPU)) + if annotations[ClassAnnotationKey] == HPA && (annotations[MetricAnnotationKey] == CPU || annotations[MetricAnnotationKey] == Memory) { + return apis.ErrInvalidKeyName(WindowAnnotationKey, apis.CurrentField, fmt.Sprintf("%s for %s %s", HPA, + MetricAnnotationKey, annotations[MetricAnnotationKey])) } switch d, err := time.ParseDuration(w); { case err != nil: @@ -225,7 +226,7 @@ func validateMetric(annotations map[string]string) *apis.FieldError { } case HPA: switch metric { - case CPU: + case CPU, Memory: return nil } default: diff --git a/vendor/knative.dev/serving/pkg/apis/autoscaling/register.go b/vendor/knative.dev/serving/pkg/apis/autoscaling/register.go index 8fe83fb75..1898f545a 100644 --- a/vendor/knative.dev/serving/pkg/apis/autoscaling/register.go +++ b/vendor/knative.dev/serving/pkg/apis/autoscaling/register.go @@ -62,6 +62,8 @@ const ( Concurrency = "concurrency" // CPU is the amount of the requested cpu actually being consumed by the Pod. CPU = "cpu" + // Memory is the amount of the requested memory actually being consumed by the Pod. + Memory = "memory" // RPS is the requests per second reaching the Pod. RPS = "rps" @@ -69,6 +71,9 @@ const ( // PodAutoscaler should attempt to maintain. For example, // autoscaling.knative.dev/metric: cpu // autoscaling.knative.dev/target: "75" # target 75% cpu utilization + // Or + // autoscaling.knative.dev/metric: memory + // autoscaling.knative.dev/target: "100" # target 100MiB memory usage TargetAnnotationKey = GroupName + "/target" // TargetMin is the minimum allowable target. // This can be less than 1 due to the fact that with small container diff --git a/vendor/modules.txt b/vendor/modules.txt index a11411ef1..b5b1328bd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -687,7 +687,7 @@ k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/pointer k8s.io/utils/trace -# knative.dev/client v0.24.1-0.20210809192512-fc7e87667ff0 +# knative.dev/client v0.24.1-0.20210811011859-035150ec4cbf ## explicit knative.dev/client/lib/test knative.dev/client/pkg/apis/client @@ -711,7 +711,7 @@ knative.dev/client/pkg/sources/v1beta2 knative.dev/client/pkg/util knative.dev/client/pkg/util/mock knative.dev/client/pkg/wait -# knative.dev/eventing v0.24.1-0.20210806092320-e7445c5583e7 +# knative.dev/eventing v0.25.0 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck knative.dev/eventing/pkg/apis/duck/v1 @@ -734,7 +734,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2 -# knative.dev/eventing-kafka v0.24.1-0.20210809151812-84628fccee83 +# knative.dev/eventing-kafka v0.25.0 ## explicit knative.dev/eventing-kafka/pkg/apis/bindings knative.dev/eventing-kafka/pkg/apis/bindings/v1beta1 @@ -800,7 +800,7 @@ knative.dev/pkg/tracing/propagation/tracecontextb3 knative.dev/pkg/tracker knative.dev/pkg/unstructured knative.dev/pkg/webhook/resourcesemantics -# knative.dev/serving v0.24.1-0.20210803152115-ac8d05d5cebd +# knative.dev/serving v0.25.0 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1 knative.dev/serving/pkg/apis/config