From dc68a6a3599661606efe501bb9349cc57a269c97 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Wed, 31 Mar 2021 00:39:22 -0700 Subject: [PATCH] upgrade to latest dependencies (#48) bumping knative.dev/pkg 3b7934e...808d622: > 808d622 Escape path before returning it in a response (# 2075) > 71e938e Fix int conversion in statefulset ordinals (# 2074) bumping knative.dev/eventing-kafka cf83811...ec5dc67: > ec5dc67 upgrade to latest dependencies (# 490) > 52d075a Support arbitrary sarama metrics (# 464) > 34d543e upgrade to latest dependencies (# 485) Signed-off-by: Knative Automation --- go.mod | 4 ++-- go.sum | 20 ++++++++++--------- vendor/knative.dev/networking/pkg/network.go | 12 +++++++++++ .../knative.dev/pkg/leaderelection/config.go | 4 ++-- vendor/modules.txt | 8 ++++---- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index eee0909db..8553ca5d9 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ require ( k8s.io/apimachinery v0.19.7 k8s.io/client-go v0.19.7 knative.dev/client v0.21.1-0.20210330082320-885f2a9bc996 - knative.dev/eventing-kafka v0.21.1-0.20210326072819-cf8381199923 + knative.dev/eventing-kafka v0.21.1-0.20210330170621-ec5dc671a6a8 knative.dev/hack v0.0.0-20210325223819-b6ab329907d3 - knative.dev/pkg v0.0.0-20210330073320-3b7934e599fb + knative.dev/pkg v0.0.0-20210330162221-808d62257db6 ) replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.3 diff --git a/go.sum b/go.sum index 748cba860..694a8e6b3 100644 --- a/go.sum +++ b/go.sum @@ -1339,34 +1339,36 @@ knative.dev/client v0.21.1-0.20210330082320-885f2a9bc996 h1:hzBLtKkSuTw0iveImS1U knative.dev/client v0.21.1-0.20210330082320-885f2a9bc996/go.mod h1:jNcqeBq5mEJ8Y9c6hQv7Tm/uwLx5T5KRu1da16O2OlY= knative.dev/eventing v0.21.0/go.mod h1:JjbVEOTJJHqo9CTxbTfrMn018hG8fOr3UfBoCJ7KWaA= knative.dev/eventing v0.21.1-0.20210312002228-3b427377abe0/go.mod h1:k/F174UcHeY70F00RAExTv2/wg8yUR20EPYX3hlD3+8= -knative.dev/eventing v0.21.1-0.20210325205419-3ebce0d42aa2 h1:d6aFEshhPxgdE83dLAzv0Rgyx7lfRjIaj56Gg+OJJ4I= -knative.dev/eventing v0.21.1-0.20210325205419-3ebce0d42aa2/go.mod h1:YJpz0vSqatCU3XiaoIhfeQWpX00C6yN15XQJ6y4fCdE= -knative.dev/eventing-kafka v0.21.1-0.20210326072819-cf8381199923 h1:puCYpTmcGsr8CcYCjYiTPymHzW9BHVOIREDA5os6KC0= -knative.dev/eventing-kafka v0.21.1-0.20210326072819-cf8381199923/go.mod h1:GfucU3TxGTq0oCTzyhnagUqlLW0tTsWLhuh7YV3ODes= +knative.dev/eventing v0.21.1-0.20210330142021-dca8b0acf039 h1:skDjBvseFTDncrI6ZF5Vxu9dP9innYrZictqXgqtsaU= +knative.dev/eventing v0.21.1-0.20210330142021-dca8b0acf039/go.mod h1:UE4xmtZ/fZWmbFOLL9u1WuBxxnTm9GmGQceuKram4Kg= +knative.dev/eventing-kafka v0.21.1-0.20210330170621-ec5dc671a6a8 h1:iLFrRgMSo6d90B69XtaxuUXLHl+WewhP8hesxa5WEOQ= +knative.dev/eventing-kafka v0.21.1-0.20210330170621-ec5dc671a6a8/go.mod h1:uEdM0f3cao/decH+hIXWgSd4FzmRvRLz7vmhBHrE2Ig= knative.dev/hack v0.0.0-20210203173706-8368e1f6eacf/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack v0.0.0-20210309141825-9b73a256fd9a/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack v0.0.0-20210317214554-58edbdc42966/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= 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/hack/schema v0.0.0-20210317214554-58edbdc42966/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= +knative.dev/hack/schema v0.0.0-20210325223819-b6ab329907d3/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-20210311182125-f51c10d6fcf0/go.mod h1:dBcp0JBxATXsbCKK43cA6LxTricz4Ur3dPHataW5J64= knative.dev/networking v0.0.0-20210311190926-430a689490e6/go.mod h1:dBcp0JBxATXsbCKK43cA6LxTricz4Ur3dPHataW5J64= -knative.dev/networking v0.0.0-20210326014619-6a77ca6c8f69 h1:PeiohVaGSKco/GxdGkhbZm+8Inf8WQ0bcKHIxlaEecQ= -knative.dev/networking v0.0.0-20210326014619-6a77ca6c8f69/go.mod h1:mvfNSGU+bI9JOha6K5ZxGFNL57Y4jnJ68X8ggqdbik4= +knative.dev/networking v0.0.0-20210329132124-45fe1f5dd35e h1:KVdsfMbpNRON/IMxZJkSlcaCVS6ot9G01A9nxht0eD8= +knative.dev/networking v0.0.0-20210329132124-45fe1f5dd35e/go.mod h1:sfplBxhMqToDapZRmMK2CWvaKmmIEH9MSDCF+c1uMGE= 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-20210310173525-bbe0bb3eb1e0/go.mod h1:pn/vClSL/iCW40TlFR91EhtmMmsyPQR2V2LavDAOOMs= knative.dev/pkg v0.0.0-20210311174826-40488532be3f/go.mod h1:pn/vClSL/iCW40TlFR91EhtmMmsyPQR2V2LavDAOOMs= knative.dev/pkg v0.0.0-20210318052054-dfeeb1817679/go.mod h1:o1aTlbc+h60DP9P6nd/WmP99Ny9Ls3U/JIjL4xMgqpw= -knative.dev/pkg v0.0.0-20210323202917-b558677ab034/go.mod h1:o1aTlbc+h60DP9P6nd/WmP99Ny9Ls3U/JIjL4xMgqpw= +knative.dev/pkg v0.0.0-20210329065222-9d92ea16c0d3/go.mod h1:PD5g8hUCXq6iR3tILjmZeJBvQfXGnHMPKryq54qHJhg= knative.dev/pkg v0.0.0-20210330073320-3b7934e599fb h1:xZ7pyPKZTLiDWN4hBTNde5NzmuPKFaV3NVItE18qRZY= knative.dev/pkg v0.0.0-20210330073320-3b7934e599fb/go.mod h1:PD5g8hUCXq6iR3tILjmZeJBvQfXGnHMPKryq54qHJhg= +knative.dev/pkg v0.0.0-20210330162221-808d62257db6 h1:hl6lY5ShQ7g7E0I+nPbknXwOOgaKmkJ+7TkCrCo80x0= +knative.dev/pkg v0.0.0-20210330162221-808d62257db6/go.mod h1:PD5g8hUCXq6iR3tILjmZeJBvQfXGnHMPKryq54qHJhg= knative.dev/reconciler-test v0.0.0-20210216030508-77f50054d024/go.mod h1:RP/K5xJylB72Go6eAsXYEsQHp4zCCNMNjmsqhvq7wko= knative.dev/reconciler-test v0.0.0-20210311161026-af80deacbe19/go.mod h1:BqljHB9eQj66yPyxOj62syip0ZZtiG0lw76XrtRe36M= -knative.dev/reconciler-test v0.0.0-20210323181117-2afde0d529e7/go.mod h1:QSd2hWDDwFh+9AHOkiECsj2ZY2DGJBKnj6aT6LITBuw= +knative.dev/reconciler-test v0.0.0-20210329193624-ea6f47034b61/go.mod h1:QSd2hWDDwFh+9AHOkiECsj2ZY2DGJBKnj6aT6LITBuw= knative.dev/serving v0.21.0/go.mod h1:PU9k1Y6YMG27XQldEu5agNkcebvSafUXKXPircQYCsE= knative.dev/serving v0.21.1-0.20210311225828-1583394c61cb h1:HX5EVjJJqIUoDAWmfulMnGvPFeKJkAC6GAuj9/y97Ig= knative.dev/serving v0.21.1-0.20210311225828-1583394c61cb/go.mod h1:5cO/KA08FzPBPuCa5CU2lEGZOP8V/zUgvoluuPcL1lQ= diff --git a/vendor/knative.dev/networking/pkg/network.go b/vendor/knative.dev/networking/pkg/network.go index 40914e064..0342b0fec 100644 --- a/vendor/knative.dev/networking/pkg/network.go +++ b/vendor/knative.dev/networking/pkg/network.go @@ -180,6 +180,9 @@ const ( // load balancers to not load balance the respective request but to // send it to the request's target directly. PassthroughLoadbalancingHeaderName = "K-Passthrough-Lb" + + // EnableMeshPodAddressabilityKey is the config for enabling pod addressability in mesh. + EnableMeshPodAddressabilityKey = "enable-mesh-pod-addressability" ) // DomainTemplateValues are the available properties people can choose from @@ -251,6 +254,14 @@ type Config struct { // cluster administrator is responsible for pre-creating ClusterDomainClaims // and delegating them to namespaces via their spec.Namespace field. AutocreateClusterDomainClaims bool + + // EnableMeshPodAddressability specifies whether networking plugins will add + // additional information to deployed applications to make their pods directl + // accessible via their IPs even if mesh is enabled and thus direct-addressability + // is usually not possible. + // Consumers like Knative Serving can use this setting to adjust their behavior + // accordingly, i.e. to drop fallback solutions for non-pod-addressable systems. + EnableMeshPodAddressability bool } // HTTPProtocol indicates a type of HTTP endpoint behavior @@ -298,6 +309,7 @@ func NewConfigFromMap(data map[string]string) (*Config, error) { cm.AsString(TagTemplateKey, &nc.TagTemplate), cm.AsInt(RolloutDurationKey, &nc.RolloutDurationSecs), cm.AsBool(AutocreateClusterDomainClaimsKey, &nc.AutocreateClusterDomainClaims), + cm.AsBool(EnableMeshPodAddressabilityKey, &nc.EnableMeshPodAddressability), ); err != nil { return nil, err } diff --git a/vendor/knative.dev/pkg/leaderelection/config.go b/vendor/knative.dev/pkg/leaderelection/config.go index 96164bd00..3d9df1dc7 100644 --- a/vendor/knative.dev/pkg/leaderelection/config.go +++ b/vendor/knative.dev/pkg/leaderelection/config.go @@ -134,8 +134,8 @@ type statefulSetID struct { func (ssID *statefulSetID) Decode(v string) error { if i := strings.LastIndex(v, "-"); i != -1 { - ui, err := strconv.ParseUint(v[i+1:], 10, 64) - ssID.ordinal = int(ui) + ui, err := strconv.Atoi(v[i+1:]) + ssID.ordinal = ui ssID.ssName = v[:i] return err } diff --git a/vendor/modules.txt b/vendor/modules.txt index e2c681e71..cbde708f4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -726,7 +726,7 @@ knative.dev/client/pkg/sources/v1alpha2 knative.dev/client/pkg/util knative.dev/client/pkg/util/mock knative.dev/client/pkg/wait -# knative.dev/eventing v0.21.1-0.20210325205419-3ebce0d42aa2 +# knative.dev/eventing v0.21.1-0.20210330142021-dca8b0acf039 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck knative.dev/eventing/pkg/apis/duck/v1 @@ -753,7 +753,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1 knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1beta1 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1alpha2 knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1alpha2/fake -# knative.dev/eventing-kafka v0.21.1-0.20210326072819-cf8381199923 +# knative.dev/eventing-kafka v0.21.1-0.20210330170621-ec5dc671a6a8 ## explicit knative.dev/eventing-kafka/pkg/apis/bindings knative.dev/eventing-kafka/pkg/apis/bindings/v1alpha1 @@ -771,11 +771,11 @@ knative.dev/eventing-kafka/pkg/common/constants # knative.dev/hack v0.0.0-20210325223819-b6ab329907d3 ## explicit knative.dev/hack -# knative.dev/networking v0.0.0-20210326014619-6a77ca6c8f69 +# knative.dev/networking v0.0.0-20210329132124-45fe1f5dd35e knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 -# knative.dev/pkg v0.0.0-20210330073320-3b7934e599fb +# knative.dev/pkg v0.0.0-20210330162221-808d62257db6 ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck