From 18ff59604195fd63f3288ec13da30875d6e045d7 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Fri, 19 Feb 2021 10:47:03 -0800 Subject: [PATCH] upgrade to latest dependencies (#1233) bumping knative.dev/eventing ef5f61d...4e5bdf9: > 4e5bdf9 :lipstick: adding check for -1 status code for the default impl (# 4897) > 403aefa Ported Broker ingress conformance test to the new test framework (# 4859) > c44a698 upgrade to latest dependencies (# 4896) > e063a8d update default-pingsource configmap checksum (# 4895) > fb8e3b4 Fixup ping source dataMaxSize configmap (# 4894) > 78ee789 Adding checkRetry from kafkaChannel (# 4890) > 30d9fa3 Format markdown (# 4891) > dbdb339 [doc] Debugging Knative controllers and friends locally with Intellij Idea (# 4886) bumping knative.dev/serving 7aa62c5...2516dae: > 2516dae swap path for domainmapping kingress for kourier (# 10811) > 130f8ac Update net-istio nightly (# 10807) > cc0209f Remove outdated todo's (# 10804) > 493918e Update net-contour nightly (# 10801) > 87bf1a9 Update net-kourier nightly (# 10800) > 7f9dd35 Update net-certmanager nightly (# 10799) > c24dc14 Validate domain mapping is not a cluster local name (# 10798) Signed-off-by: Knative Automation --- go.mod | 4 +-- go.sum | 10 +++--- .../pkg/apis/sources/config/ping_defaults.go | 35 +++++++------------ .../eventing/pkg/apis/sources/config/store.go | 2 +- .../apis/sources/v1alpha2/ping_validation.go | 2 +- .../apis/sources/v1beta1/ping_validation.go | 2 +- .../apis/sources/v1beta2/ping_validation.go | 4 +-- .../v1alpha1/domainmapping_validation.go | 11 +++++- vendor/modules.txt | 4 +-- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/go.mod b/go.mod index 9c8167da1..22c851012 100644 --- a/go.mod +++ b/go.mod @@ -21,11 +21,11 @@ require ( k8s.io/cli-runtime v0.19.7 k8s.io/client-go v0.19.7 k8s.io/code-generator v0.19.7 - knative.dev/eventing v0.20.1-0.20210216203459-ef5f61dadd7d + knative.dev/eventing v0.20.1-0.20210219125302-4e5bdf97930a knative.dev/hack v0.0.0-20210203173706-8368e1f6eacf knative.dev/networking v0.0.0-20210216014426-94bfc013982b knative.dev/pkg v0.0.0-20210216013737-584933f8280b - knative.dev/serving v0.20.1-0.20210217010702-7aa62c5bebdf + knative.dev/serving v0.20.1-0.20210219075403-2516dae3d46e sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index 852b51753..d4ea6d8ca 100644 --- a/go.sum +++ b/go.sum @@ -1306,8 +1306,8 @@ k8s.io/utils v0.0.0-20200729134348-d5654de09c73/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/eventing v0.20.1-0.20210216203459-ef5f61dadd7d h1:Dyv3HEqSMTGZj9bZJrQBo4Eruc3dABjVM9+zAaS6V50= -knative.dev/eventing v0.20.1-0.20210216203459-ef5f61dadd7d/go.mod h1:3XibpVIriBFW31rn4uFQlTzqZgyKHgD4CTJHBwEPrUQ= +knative.dev/eventing v0.20.1-0.20210219125302-4e5bdf97930a h1:3cqlUxlZ6M+EZA80OTroRXz7XNNImc4Qix01jqOA1Bo= +knative.dev/eventing v0.20.1-0.20210219125302-4e5bdf97930a/go.mod h1:JjbVEOTJJHqo9CTxbTfrMn018hG8fOr3UfBoCJ7KWaA= knative.dev/hack v0.0.0-20210203173706-8368e1f6eacf h1:u4cY4jr2LYvhoz/1HBWEPsMiLkm0HMdDTfmmw1RE8zE= knative.dev/hack v0.0.0-20210203173706-8368e1f6eacf/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/networking v0.0.0-20210215030235-088986a1c2a3/go.mod h1:pmAMQjMqQUxpK0UyjE71KljMs6rwDMVIAlvrZsU3I6Y= @@ -1317,9 +1317,9 @@ knative.dev/pkg v0.0.0-20210212203835-448ae657fb5f/go.mod h1:TJSdebQOWX5N2bszohO knative.dev/pkg v0.0.0-20210215165523-84c98f3c3e7a/go.mod h1:TJSdebQOWX5N2bszohOYVi0H1QtXbtlYLuMghAFBMhY= knative.dev/pkg v0.0.0-20210216013737-584933f8280b h1:2v+GBBenjPXhtk3KX/YqxCQVBU6o/AaRkkqE58lgFRQ= knative.dev/pkg v0.0.0-20210216013737-584933f8280b/go.mod h1:TJSdebQOWX5N2bszohOYVi0H1QtXbtlYLuMghAFBMhY= -knative.dev/reconciler-test v0.0.0-20210215155505-fe22009753f9/go.mod h1:vB3GnWUdlkvtmoVUP9anmh82S1QC/LJKtOrAMA1COtw= -knative.dev/serving v0.20.1-0.20210217010702-7aa62c5bebdf h1:aLjH83TzI5GJOSFEz1pGZD0oa3Q2feE82sFdq/4tp5s= -knative.dev/serving v0.20.1-0.20210217010702-7aa62c5bebdf/go.mod h1:PU9k1Y6YMG27XQldEu5agNkcebvSafUXKXPircQYCsE= +knative.dev/reconciler-test v0.0.0-20210216030508-77f50054d024/go.mod h1:RP/K5xJylB72Go6eAsXYEsQHp4zCCNMNjmsqhvq7wko= +knative.dev/serving v0.20.1-0.20210219075403-2516dae3d46e h1:nPwnrjTsPdf4eVlhHDPckURcKIZwe4lXoiIeMHcQ6TU= +knative.dev/serving v0.20.1-0.20210219075403-2516dae3d46e/go.mod h1:PU9k1Y6YMG27XQldEu5agNkcebvSafUXKXPircQYCsE= 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/eventing/pkg/apis/sources/config/ping_defaults.go b/vendor/knative.dev/eventing/pkg/apis/sources/config/ping_defaults.go index 77aa40ca8..e3a1fff15 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/config/ping_defaults.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/config/ping_defaults.go @@ -17,48 +17,39 @@ limitations under the License. package config import ( - "encoding/json" "fmt" + "strconv" corev1 "k8s.io/api/core/v1" - "sigs.k8s.io/yaml" ) const ( // PingDefaultsConfigName is the name of config map for the default // configs that pings should use. - PingDefaultsConfigName = "config-ping-webhook" + PingDefaultsConfigName = "config-ping-defaults" - // PingDefaulterKey is the key in the ConfigMap to get the name of the default - // Ping CRD. - PingDefaulterKey = "ping-config" + DataMaxSizeKey = "dataMaxSize" - PingDataMaxSize = -1 + DefaultDataMaxSize = -1 ) // NewPingDefaultsConfigFromMap creates a Defaults from the supplied Map func NewPingDefaultsConfigFromMap(data map[string]string) (*PingDefaults, error) { - nc := &PingDefaults{DataMaxSize: PingDataMaxSize} + nc := &PingDefaults{DataMaxSize: DefaultDataMaxSize} - // Parse out the Broker Configuration Cluster default section - value, present := data[PingDefaulterKey] + // Parse out the MaxSizeKey + value, present := data[DataMaxSizeKey] if !present || value == "" { - return nil, fmt.Errorf("ConfigMap is missing (or empty) key: %q : %v", PingDefaulterKey, data) + return nc, nil } - if err := parseEntry(value, nc); err != nil { + int64Value, err := strconv.ParseInt(value, 0, 64) + if err != nil { return nil, fmt.Errorf("Failed to parse the entry: %s", err) } + nc.DataMaxSize = int64Value return nc, nil } -func parseEntry(entry string, out interface{}) error { - j, err := yaml.YAMLToJSON([]byte(entry)) - if err != nil { - return fmt.Errorf("ConfigMap's value could not be converted to JSON: %s : %v", err, entry) - } - return json.Unmarshal(j, &out) -} - // NewPingDefaultsConfigFromConfigMap creates a PingDefaults from the supplied configMap func NewPingDefaultsConfigFromConfigMap(config *corev1.ConfigMap) (*PingDefaults, error) { return NewPingDefaultsConfigFromMap(config.Data) @@ -66,12 +57,12 @@ func NewPingDefaultsConfigFromConfigMap(config *corev1.ConfigMap) (*PingDefaults // PingDefaults includes the default values to be populated by the webhook. type PingDefaults struct { - DataMaxSize int `json:"dataMaxSize"` + DataMaxSize int64 `json:"dataMaxSize"` } func (d *PingDefaults) GetPingConfig() *PingDefaults { if d.DataMaxSize < 0 { - d.DataMaxSize = PingDataMaxSize + d.DataMaxSize = DefaultDataMaxSize } return d diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/config/store.go b/vendor/knative.dev/eventing/pkg/apis/sources/config/store.go index 3b5a567d6..ceab865de 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/config/store.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/config/store.go @@ -47,7 +47,7 @@ func FromContextOrDefaults(ctx context.Context) *Config { } pingDefaults, err := NewPingDefaultsConfigFromMap(map[string]string{}) if err != nil || pingDefaults == nil { - pingDefaults = &PingDefaults{DataMaxSize: PingDataMaxSize} + pingDefaults = &PingDefaults{DataMaxSize: DefaultDataMaxSize} pingDefaults.GetPingConfig() } diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1alpha2/ping_validation.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1alpha2/ping_validation.go index 8d0489494..84a01f3ae 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/v1alpha2/ping_validation.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/v1alpha2/ping_validation.go @@ -43,7 +43,7 @@ func (cs *PingSourceSpec) Validate(ctx context.Context) *apis.FieldError { pingConfig := config.FromContextOrDefaults(ctx) pingDefaults := pingConfig.PingDefaults.GetPingConfig() - if bsize := len(cs.JsonData); pingDefaults.DataMaxSize > -1 && bsize > pingDefaults.DataMaxSize { + if bsize := int64(len(cs.JsonData)); pingDefaults.DataMaxSize > -1 && bsize > pingDefaults.DataMaxSize { fe := apis.ErrInvalidValue(fmt.Sprintf("the jsonData length of %d bytes exceeds limit set at %d.", bsize, pingDefaults.DataMaxSize), "jsonData") errs = errs.Also(fe) } diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1beta1/ping_validation.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1beta1/ping_validation.go index df07d799b..b4ca07f4b 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/v1beta1/ping_validation.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/v1beta1/ping_validation.go @@ -53,7 +53,7 @@ func (cs *PingSourceSpec) Validate(ctx context.Context) *apis.FieldError { pingDefaults := pingConfig.PingDefaults.GetPingConfig() - if bsize := len(cs.JsonData); pingDefaults.DataMaxSize > -1 && bsize > pingDefaults.DataMaxSize { + if bsize := int64(len(cs.JsonData)); pingDefaults.DataMaxSize > -1 && bsize > pingDefaults.DataMaxSize { fe := apis.ErrInvalidValue(fmt.Sprintf("the jsonData length of %d bytes exceeds limit set at %d.", bsize, pingDefaults.DataMaxSize), "jsonData") errs = errs.Also(fe) } diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/ping_validation.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/ping_validation.go index 189a38ccb..5bbd2d7f0 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/ping_validation.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/ping_validation.go @@ -63,7 +63,7 @@ func (cs *PingSourceSpec) Validate(ctx context.Context) *apis.FieldError { if cs.Data != "" && cs.DataBase64 != "" { errs = errs.Also(apis.ErrMultipleOneOf("data", "dataBase64")) } else if cs.DataBase64 != "" { - if bsize := len(cs.DataBase64); pingDefaults.DataMaxSize > -1 && bsize > pingDefaults.DataMaxSize { + if bsize := int64(len(cs.DataBase64)); pingDefaults.DataMaxSize > -1 && bsize > pingDefaults.DataMaxSize { fe := apis.ErrInvalidValue(fmt.Sprintf("the dataBase64 length of %d bytes exceeds limit set at %d.", bsize, pingDefaults.DataMaxSize), "dataBase64") errs = errs.Also(fe) } @@ -80,7 +80,7 @@ func (cs *PingSourceSpec) Validate(ctx context.Context) *apis.FieldError { } } } else if cs.Data != "" { - if bsize := len(cs.Data); pingDefaults.DataMaxSize > -1 && bsize > pingDefaults.DataMaxSize { + if bsize := int64(len(cs.Data)); pingDefaults.DataMaxSize > -1 && bsize > pingDefaults.DataMaxSize { fe := apis.ErrInvalidValue(fmt.Sprintf("the data length of %d bytes exceeds limit set at %d.", bsize, pingDefaults.DataMaxSize), "data") errs = errs.Also(fe) } diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_validation.go b/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_validation.go index 0f25adfbb..3158ef4ec 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_validation.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1alpha1/domainmapping_validation.go @@ -19,10 +19,12 @@ package v1alpha1 import ( "context" "fmt" + "strings" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" "knative.dev/pkg/apis" + "knative.dev/pkg/network" "knative.dev/serving/pkg/apis/serving" ) @@ -44,7 +46,14 @@ func (dm *DomainMapping) validateMetadata(ctx context.Context) (errs *apis.Field err := validation.IsFullyQualifiedDomainName(field.NewPath("name"), dm.Name) if err != nil { - errs = errs.Also(apis.ErrGeneric(fmt.Sprintf("invalid name %q: %s", dm.Name, err.ToAggregate()), "name")) + errs = errs.Also(apis.ErrGeneric(fmt.Sprintf( + "invalid name %q: %s", dm.Name, err.ToAggregate()), "name")) + } + + clusterLocalDomain := network.GetClusterDomainName() + if strings.HasSuffix(dm.Name, "."+clusterLocalDomain) { + errs = errs.Also(apis.ErrGeneric( + fmt.Sprintf("invalid name %q: must not be a subdomain of cluster local domain %q", dm.Name, clusterLocalDomain), "name")) } if apis.IsInUpdate(ctx) { diff --git a/vendor/modules.txt b/vendor/modules.txt index a9bdb8ca1..86965e7c8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -771,7 +771,7 @@ k8s.io/kube-openapi/pkg/util/sets k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# knative.dev/eventing v0.20.1-0.20210216203459-ef5f61dadd7d +# knative.dev/eventing v0.20.1-0.20210219125302-4e5bdf97930a ## explicit knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/configs @@ -854,7 +854,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.20.1-0.20210217010702-7aa62c5bebdf +# knative.dev/serving v0.20.1-0.20210219075403-2516dae3d46e ## explicit knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1