Skip to content

Commit

Permalink
upgrade to latest dependencies (#931)
Browse files Browse the repository at this point in the history
bumping knative.dev/networking 3f52bdb...22d1b93:
  > 22d1b93 upgrade to latest dependencies (# 676)
  > 5d159ff Update actions (# 675)
  > 941c61a move label to apis/networking (# 674)
  > 773e2bf fix deprecated comments (# 673)
bumping knative.dev/hack b4d4d73...12d3e2a:
  > 12d3e2a switch to UTC (# 176)
bumping knative.dev/pkg f907b31...19adf79:
  > 19adf79 upgrade to latest dependencies (# 2524)
  > b0ff5ad Update actions (# 2523)

Signed-off-by: Knative Automation <automation@knative.team>
  • Loading branch information
knative-automation authored May 28, 2022
1 parent 5726ab2 commit 9ab0b80
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 73 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
k8s.io/api v0.23.5
k8s.io/apimachinery v0.23.5
k8s.io/client-go v0.23.5
knative.dev/hack v0.0.0-20220518013938-b4d4d73a2995
knative.dev/networking v0.0.0-20220518013728-3f52bdb63511
knative.dev/pkg v0.0.0-20220518013728-f907b31046d3
knative.dev/hack v0.0.0-20220524153203-12d3e2a7addc
knative.dev/networking v0.0.0-20220524205304-22d1b933cf73
knative.dev/pkg v0.0.0-20220524202603-19adf798efb8
)
15 changes: 6 additions & 9 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1194,15 +1194,12 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
knative.dev/hack v0.0.0-20220427014036-5f473869d377/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20220503220458-46c77f157e20/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/hack v0.0.0-20220518013938-b4d4d73a2995 h1:Bt1Mdo6K6E4gaVUFiI8ZMvFcvsb0e10vLFyW7qKRxy4=
knative.dev/hack v0.0.0-20220518013938-b4d4d73a2995/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/networking v0.0.0-20220518013728-3f52bdb63511 h1:27VaOzdAjjd3zVKPYFZpahTyws1+n9SlwsXHzFbOZcU=
knative.dev/networking v0.0.0-20220518013728-3f52bdb63511/go.mod h1:8JUhHDPrN9DKOnvpysGIP5trCv7FiGkXq+RDP1605RA=
knative.dev/pkg v0.0.0-20220503223858-245166458ef4/go.mod h1:NXK3p/UMCbFybBM9xQGii3TuMN/WKHByXcYsTwZ6Y6U=
knative.dev/pkg v0.0.0-20220518013728-f907b31046d3 h1:NElwuc4+cGeJGwJEv65uyd552nFedHTBI4rtVZ+eDRw=
knative.dev/pkg v0.0.0-20220518013728-f907b31046d3/go.mod h1:mRzBIY8eoQurpADZ4+3LzNuucKOBhsSvhX6lXqMVpIc=
knative.dev/hack v0.0.0-20220524153203-12d3e2a7addc h1:gqxyFRgwJDioT4DmRYezz6z2j/wvFZVUbl6c9KeMj6I=
knative.dev/hack v0.0.0-20220524153203-12d3e2a7addc/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/networking v0.0.0-20220524205304-22d1b933cf73 h1:TNa2x1vLb8vGa+i0lrqFAkRwQp8+Bt1iHdKI6ZV4KDY=
knative.dev/networking v0.0.0-20220524205304-22d1b933cf73/go.mod h1:oIETD09Q4GSOXjdBdiPc0eEQxMwmjH7/gdhfg+sgdW8=
knative.dev/pkg v0.0.0-20220524202603-19adf798efb8 h1:7vZxPKJsJ4LkJTLiTy48nfykzfDi69OS4GKRs0qeSM4=
knative.dev/pkg v0.0.0-20220524202603-19adf798efb8/go.mod h1:pApypeWDkGrsMkUDkV6StWXS4CXhwGWuJEID9GGZY0Y=
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=
Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/hack/library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function make_banner() {
echo -e "${border}\n${msg}\n${border}"
# TODO(adrcunha): Remove once logs have timestamps on Prow
# For details, see https://github.com/kubernetes/test-infra/issues/10100
echo -e "$1$1$1$1 $(TZ='America/Los_Angeles' date)\n${border}"
echo -e "$1$1$1$1 $(TZ='UTC' date)\n${border}"
}

# Simple header for logging purposes.
Expand Down
6 changes: 6 additions & 0 deletions vendor/knative.dev/networking/pkg/apis/networking/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,12 @@ const (
// WildcardCertDomainLabelKey is the label key attached to a certificate to indicate the
// domain for which it was issued.
WildcardCertDomainLabelKey = PublicGroupName + "/wildcardDomain"

// VisibilityLabelKey is the label to indicate visibility of Route
// and KServices. It can be an annotation too but since users are
// already using labels for domain, it probably best to keep this
// consistent.
VisibilityLabelKey = PublicGroupName + "/visibility"
)

// Pseudo-constants
Expand Down
8 changes: 4 additions & 4 deletions vendor/knative.dev/networking/pkg/deprecated_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,15 +215,15 @@ const (
// required when mesh is enabled (unless EnableMeshPodAddressability is set),
// but is less efficient.
//
// Deprecated: Use knative.dev/pkg/config/MeshCompatibilityModeEnabled
// Deprecated: Use knative.dev/networking/pkg/config/MeshCompatibilityModeEnabled
MeshCompatibilityModeEnabled MeshCompatibilityMode = config.MeshCompatibilityModeEnabled

// MeshCompatibilityModeDisabled instructs consumers of network plugins, such as
// Knative Serving, to connect to individual Pod IPs. This is most efficient,
// but will only work with mesh enabled when EnableMeshPodAddressability is
// used.
//
// Deprecated: Use knative.dev/pkg/config/MeshCompatibilityModeDisabled
// Deprecated: Use knative.dev/networking/pkg/config/MeshCompatibilityModeDisabled
MeshCompatibilityModeDisabled MeshCompatibilityMode = config.MeshCompatibilityModeDisabled

// MeshCompatibilityModeAuto instructs consumers of network plugins, such as
Expand All @@ -232,7 +232,7 @@ const (
// determine whether mesh is enabled, and fall back from Direct Pod IP
// communication to Cluster IP as needed.
//
// Deprecated: Use knative.dev/pkg/config/MeshCompatibilityModeAuto
// Deprecated: Use knative.dev/networking/pkg/config/MeshCompatibilityModeAuto
MeshCompatibilityModeAuto MeshCompatibilityMode = config.MeshCompatibilityModeAuto
)

Expand All @@ -243,5 +243,5 @@ func NewConfigFromConfigMap(configMap *corev1.ConfigMap) (*Config, error) {

// NewConfigFromMap creates a Config from the supplied data.
//
// Deprecated: Use knative.dev/pkg/config/NewConfigFromMap
// Deprecated: Use knative.dev/networking/pkg/config/NewConfigFromMap
var NewConfigFromMap = config.NewConfigFromMap
46 changes: 23 additions & 23 deletions vendor/knative.dev/networking/pkg/deprecated_header.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,142 +26,142 @@ const (
// with this header will not be passed to the user container or
// included in request metrics.
//
// Deprecated: use knative.dev/networking/pkg/header.ProbeKey
// Deprecated: use knative.dev/networking/pkg/http/header.ProbeKey
ProbeHeaderName = header.ProbeKey

// ProxyHeaderName is the name of an internal header that activator
// uses to mark requests going through it.
//
// Deprecated: use knative.dev/networking/pkg/header.ProxyKey
// Deprecated: use knative.dev/networking/pkg/http/header.ProxyKey
ProxyHeaderName = header.ProxyKey

// HashHeaderName is the name of an internal header that Ingress controller
// uses to find out which version of the networking config is deployed.
//
// Deprecated: use knative.dev/networking/pkg/header.HashKey
// Deprecated: use knative.dev/networking/pkg/http/header.HashKey
HashHeaderName = header.HashKey

// HashHeaderValue is the value that must appear in the HashHeaderName
// header in order for our network hash to be injected.
//
// Deprecated: use knative.dev/networking/pkg/header.HashValueOverride
// Deprecated: use knative.dev/networking/pkg/http/header.HashValueOverride
HashHeaderValue = header.HashValueOverride

// OriginalHostHeader is used to avoid Istio host based routing rules
// in Activator.
// The header contains the original Host value that can be rewritten
// at the Queue proxy level back to be a host header.
//
// Deprecated: use knative.dev/networking/pkg/header.OriginalHostKey
// Deprecated: use knative.dev/networking/pkg/http/header.OriginalHostKey
OriginalHostHeader = header.OriginalHostKey

// KubeProbeUAPrefix is the user agent prefix of the probe.
// Since K8s 1.8, prober requests have
// User-Agent = "kube-probe/{major-version}.{minor-version}".
//
// Deprecated: use knative.dev/networking/pkg/header.KubeProbeUAPrefix
// Deprecated: use knative.dev/networking/pkg/http/header.KubeProbeUAPrefix
KubeProbeUAPrefix = header.KubeProbeUAPrefix

// KubeletProbeHeaderName is the name of the header supplied by kubelet
// probes. Istio with mTLS rewrites probes, but their probes pass a
// different user-agent. So we augment the probes with this header.
//
// Deprecated: use knative.dev/networking/pkg/header.KubeletProbeHeaderName
// Deprecated: use knative.dev/networking/pkg/http/header.KubeletProbeKey
KubeletProbeHeaderName = header.KubeletProbeKey

// UserAgentKey is the constant for header "User-Agent".
//
// Deprecated: use knative.dev/networking/pkg/header.UserAgentKey
// Deprecated: use knative.dev/networking/pkg/http/header.UserAgentKey
UserAgentKey = header.UserAgentKey

// ActivatorUserAgent is the user-agent header value set in probe requests sent
// from activator.
//
// Deprecated: use knative.dev/networking/pkg/header.ActivatorUserAgent
// Deprecated: use knative.dev/networking/pkg/http/header.ActivatorUserAgent
ActivatorUserAgent = header.ActivatorUserAgent

// QueueProxyUserAgent is the user-agent header value set in probe requests sent
// from queue-proxy.
//
// Deprecated: use knative.dev/networking/pkg/header.QueueProxyUserAgent
// Deprecated: use knative.dev/networking/pkg/http/header.QueueProxyUserAgent
QueueProxyUserAgent = header.QueueProxyUserAgent

// IngressReadinessUserAgent is the user-agent header value
// set in probe requests for Ingress status.
//
// Deprecated: use knative.dev/networking/pkg/header.IngressReadinessUserAgent
// Deprecated: use knative.dev/networking/pkg/http/header.IngressReadinessUserAgent
IngressReadinessUserAgent = header.IngressReadinessUserAgent

// AutoscalingUserAgent is the user-agent header value set in probe
// requests sent by autoscaling implementations.
//
// Deprecated: use knative.dev/networking/pkg/header.ActivatorUserAgent
// Deprecated: use knative.dev/networking/pkg/http/header.AutoscalingUserAgent
AutoscalingUserAgent = header.AutoscalingUserAgent

// TagHeaderName is the name of the header entry which has a tag name as value.
// The tag name specifies which route was expected to be chosen by Ingress.
//
// Deprecated: use knative.dev/networking/pkg/header.RouteTagKey
// Deprecated: use knative.dev/networking/pkg/http/header.RouteTagKey
TagHeaderName = header.RouteTagKey

// DefaultRouteHeaderName is the name of the header entry
// identifying whether a request is routed via the default route or not.
// It has one of the string value "true" or "false".
//
// Deprecated: use knative.dev/networking/pkg/header.DefaultRouteKey
// Deprecated: use knative.dev/networking/pkg/http/header.DefaultRouteKey
DefaultRouteHeaderName = header.DefaultRouteKey

// PassthroughLoadbalancingHeaderName is the name of the header that directs
// load balancers to not load balance the respective request but to
// send it to the request's target directly.
//
// Deprecated: use knative.dev/networking/pkg/header.PassthroughLoadbalancingHeaderName
// Deprecated: use knative.dev/networking/pkg/http/header.PassthroughLoadbalancingKey
PassthroughLoadbalancingHeaderName = header.PassthroughLoadbalancingKey

// ProtoAcceptContent is the content type to be used when autoscaler scrapes metrics from the QP
//
// Deprecated: use knative.dev/networking/pkg/header.ProtobufMIMEType
// Deprecated: use knative.dev/networking/pkg/http/header.ProtobufMIMEType
ProtoAcceptContent = header.ProtobufMIMEType

// ProbeHeaderValue is the value used in 'K-Network-Probe'
//
// Deprecated: use knative.dev/networking/pkg/header.ProbeValue
// Deprecated: use knative.dev/networking/pkg/http/header.ProbeValue
ProbeHeaderValue = header.ProbeValue
)

// IsKubeletProbe returns true if the request is a Kubernetes probe.
//
// Deprecated: use knative.dev/networking/pkg/header.IsKubeletProbe
// Deprecated: use knative.dev/networking/pkg/http/header.IsKubeletProbe
var IsKubeletProbe = header.IsKubeletProbe

// KnativeProbeHeader returns the value for key ProbeHeaderName in request headers.
//
// Deprecated: use knative.dev/networking/pkg/header.GetKnativeProbeValue
// Deprecated: use knative.dev/networking/pkg/http/header.GetKnativeProbeValue
var KnativeProbeHeader = header.GetKnativeProbeValue

// KnativeProxyHeader returns the value for key ProxyHeaderName in request headers.
//
// Deprecated: use knative.dev/networking/pkg/header.GetKnativeProxyValue
// Deprecated: use knative.dev/networking/pkg/http/header.GetKnativeProxyValue
var KnativeProxyHeader = header.GetKnativeProxyValue

// IsProbe returns true if the request is a Kubernetes probe or a Knative probe,
// i.e. non-empty ProbeHeaderName header.
//
// Deprecated: use knative.dev/networking/pkg/header.IsProbe
// Deprecated: use knative.dev/networking/pkg/http/header.IsProbe
var IsProbe = header.IsProbe

// RewriteHostIn removes the `Host` header from the inbound (server) request
// and replaces it with our custom header.
// This is done to avoid Istio Host based routing, see #3870.
// Queue-Proxy will execute the reverse process.
//
// Deprecated: use knative.dev/networking/pkg/header.RewriteHostIn
// Deprecated: use knative.dev/networking/pkg/http/header.RewriteHostIn
var RewriteHostIn = header.RewriteHostIn

// RewriteHostOut undoes the `RewriteHostIn` action.
// RewriteHostOut checks if network.OriginalHostHeader was set and if it was,
// then uses that as the r.Host (which takes priority over Request.Header["Host"]).
// If the request did not have the OriginalHostHeader header set, the request is untouched.
//
// Deprecated: use knative.dev/networking/pkg/header.RewriteHostOut
// Deprecated: use knative.dev/networking/pkg/http/header.RewriteHostOut
var RewriteHostOut = header.RewriteHostOut
2 changes: 1 addition & 1 deletion vendor/knative.dev/networking/pkg/deprecated_http.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const (
// streaming/websockets, without flushing more often than necessary for
// non-streaming requests.
//
// Deprecated: use knative.dev/networking/pkg/http.ReverseProxyFlushInterval
// Deprecated: use knative.dev/networking/pkg/http/proxy.FlushInterval
FlushInterval = proxy.FlushInterval
)

Expand Down
6 changes: 3 additions & 3 deletions vendor/knative.dev/networking/pkg/deprecated_labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ limitations under the License.

package pkg

import "knative.dev/networking/pkg/labels"
import "knative.dev/networking/pkg/apis/networking"

const (
// VisibilityLabelKey is the label to indicate visibility of Route
// and KServices. It can be an annotation too but since users are
// already using labels for domain, it probably best to keep this
// consistent.
//
// Deprecated: use knative.dev/networking/pkg/labels.VisibilityLabelKey
VisibilityLabelKey = labels.VisibilityLabelKey
// Deprecated: use knative.dev/networking/pkg/apis/networking.VisibilityLabelKey
VisibilityLabelKey = networking.VisibilityLabelKey
)
25 changes: 0 additions & 25 deletions vendor/knative.dev/networking/pkg/labels/labels.go

This file was deleted.

7 changes: 3 additions & 4 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -806,10 +806,10 @@ k8s.io/utils/lru
k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/trace
# knative.dev/hack v0.0.0-20220518013938-b4d4d73a2995
# knative.dev/hack v0.0.0-20220524153203-12d3e2a7addc
## explicit
knative.dev/hack
# knative.dev/networking v0.0.0-20220518013728-3f52bdb63511
# knative.dev/networking v0.0.0-20220524205304-22d1b933cf73
## explicit
knative.dev/networking/config
knative.dev/networking/pkg
Expand Down Expand Up @@ -844,7 +844,6 @@ knative.dev/networking/pkg/http/proxy
knative.dev/networking/pkg/http/stats
knative.dev/networking/pkg/ingress
knative.dev/networking/pkg/k8s
knative.dev/networking/pkg/labels
knative.dev/networking/pkg/prober
knative.dev/networking/pkg/status
knative.dev/networking/pkg/testing/status
Expand All @@ -860,7 +859,7 @@ knative.dev/networking/test/test_images/runtime/handlers
knative.dev/networking/test/test_images/timeout
knative.dev/networking/test/test_images/wsserver
knative.dev/networking/test/types
# knative.dev/pkg v0.0.0-20220518013728-f907b31046d3
# knative.dev/pkg v0.0.0-20220524202603-19adf798efb8
## explicit
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
Expand Down

0 comments on commit 9ab0b80

Please sign in to comment.