Skip to content

Commit

Permalink
upgrade to latest dependencies (#14661)
Browse files Browse the repository at this point in the history
bumping knative.dev/pkg 23f3ee2...ea6ea84:
  > ea6ea84 upgrade to latest dependencies (# 2901)
bumping knative.dev/caching ebc94e6...a65bf6e:
  > a65bf6e upgrade to latest dependencies (# 810)
bumping knative.dev/networking 25da91b...bb18aab:
  > bb18aab Add additional encryption config flags + labels (# 891)
  > a509117 upgrade to latest dependencies (# 895)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
knative-automation authored Nov 24, 2023
1 parent 636dfad commit 9b0d185
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 18 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ require (
k8s.io/code-generator v0.27.6
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
k8s.io/utils v0.0.0-20230209194617-a36077c30491
knative.dev/caching v0.0.0-20231120182559-ebc94e6a3cdf
knative.dev/caching v0.0.0-20231123185038-a65bf6e6e291
knative.dev/hack v0.0.0-20231122182901-eb352426ecc1
knative.dev/networking v0.0.0-20231120182743-25da91b5cef2
knative.dev/pkg v0.0.0-20231122190403-23f3ee2ee35b
knative.dev/networking v0.0.0-20231123185844-bb18aab9ae99
knative.dev/pkg v0.0.0-20231123185329-ea6ea8440341
sigs.k8s.io/yaml v1.4.0
)

Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -944,14 +944,14 @@ k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5F
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/caching v0.0.0-20231120182559-ebc94e6a3cdf h1:Hk6pE28tWXHbW5p+4uoqMBpbk04Xhq2o5cHhv7pDi9I=
knative.dev/caching v0.0.0-20231120182559-ebc94e6a3cdf/go.mod h1:kOQlfb6k1kHQcl4yGD58h3soJXioXdRVbHjvXKmrFzU=
knative.dev/caching v0.0.0-20231123185038-a65bf6e6e291 h1:kd/jMp9tC+jWr+9PuPNgNKxHFCCI06mKfcLDDpHLz2Y=
knative.dev/caching v0.0.0-20231123185038-a65bf6e6e291/go.mod h1:iT8mh3wTPShKx0ei7XDCQTCTNU80a8dRLZAcqufySOA=
knative.dev/hack v0.0.0-20231122182901-eb352426ecc1 h1:ZUkFAaq5gEls7bJ2ADLg+ZJVtN3KUcHEWx5ngLfacuQ=
knative.dev/hack v0.0.0-20231122182901-eb352426ecc1/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/networking v0.0.0-20231120182743-25da91b5cef2 h1:X7n5ycnRy0/0np5jASqUQcUyidoRux9Zy+B6gbSy3oc=
knative.dev/networking v0.0.0-20231120182743-25da91b5cef2/go.mod h1:HQ3rA7qrKVWvZUl6GGQefn/PzNXlX4e94KpbwBEjFcQ=
knative.dev/pkg v0.0.0-20231122190403-23f3ee2ee35b h1:ZDodmDWTYRhSQJMir3Q7P5GyRM+w5W1J2fMBto3pfJ8=
knative.dev/pkg v0.0.0-20231122190403-23f3ee2ee35b/go.mod h1:tLmRcSDWCzcsoitR+xfghXDxFYdOMIMdBXiazmdmb2Y=
knative.dev/networking v0.0.0-20231123185844-bb18aab9ae99 h1:LFBdYo3YPRH5LwZpQSLrcL0vhzL7zKrI93Mfa+PxkEw=
knative.dev/networking v0.0.0-20231123185844-bb18aab9ae99/go.mod h1:ESsvanBOBBkDxO1qa9mlBhV5yoBH1svcpy/dVmBNdJw=
knative.dev/pkg v0.0.0-20231123185329-ea6ea8440341 h1:GVSTPofS7DbTTxoJw4TwfxNWCzH4QcSI5jm4F7tgDPE=
knative.dev/pkg v0.0.0-20231123185329-ea6ea8440341/go.mod h1:uOiSmQ4t36/4qxaY+hrrgrNNNkDqj6BGZVjtV+cQ+V4=
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
4 changes: 4 additions & 0 deletions vendor/knative.dev/networking/pkg/apis/networking/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ const (
// already using labels for domain, it probably best to keep this
// consistent.
VisibilityLabelKey = PublicGroupName + "/visibility"

// CertificateTypeLabelKey is the label to indicate the type of Knative certificate
// used for Knative Serving encryption functionality. Corresponding values are defined in config.CertificateType.
CertificateTypeLabelKey = PublicGroupName + "/certificate-type"
)

// Pseudo-constants
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
Copyright 2023 The Knative Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1

import (
"slices"
)

// GetIngressTLSForVisibility returns a list of `Spec.TLS` where each host in the `Rules.Hosts` field is
// present in `Spec.TLS.Hosts` and where the Rules have the defined ingress visibility.
// This method can be used in net-* implementations to select the correct `IngressTLS` entries
// for cluster-local and cluster-external gateways/listeners.
func (i *Ingress) GetIngressTLSForVisibility(visibility IngressVisibility) []IngressTLS {
ingressTLS := make([]IngressTLS, 0, len(i.Spec.TLS))

if i.Spec.TLS == nil || len(i.Spec.TLS) == 0 {
return ingressTLS
}

for _, rule := range i.Spec.Rules {
if rule.Visibility == visibility {
if rule.Hosts == nil || len(rule.Hosts) == 0 {
return ingressTLS
}

for _, tls := range i.Spec.TLS {
containsAllRuleHosts := true
for _, h := range rule.Hosts {
if !slices.Contains(tls.Hosts, h) {
containsAllRuleHosts = false
}
}
if containsAllRuleHosts {
ingressTLS = append(ingressTLS, tls)
}
}
}
}

return ingressTLS
}
20 changes: 14 additions & 6 deletions vendor/knative.dev/networking/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@ const (
// Certificate reconciler.
CertManagerCertificateClassName = "cert-manager.certificate.networking.knative.dev"

// ServingInternalCertName is the name of secret contains certificates in serving
// system namespace.
//
// Deprecated: ServingInternalCertName is deprecated. Use ServingRoutingCertName instead.
ServingInternalCertName = "knative-serving-certs"

// ServingRoutingCertName is the name of secret contains certificates for Routing data in serving
// system namespace. (Used by Ingress GWs and Activator)
ServingRoutingCertName = "routing-serving-certs"
Expand Down Expand Up @@ -148,6 +142,20 @@ const (
SystemInternalTLSKey = "system-internal-tls"
)

// CertificateType indicates the type of Knative Certificate.
type CertificateType string

const (
// CertificateSystemInternal defines a certificate used for `system-internal-tls`.
CertificateSystemInternal CertificateType = "system-internal"

// CertificateClusterLocalDomain defines a certificate used for `cluster-local-domain-tls`.
CertificateClusterLocalDomain CertificateType = "cluster-local-domain"

// CertificateExternalDomain defines a cerificate used for `external-domain-tls`.
CertificateExternalDomain CertificateType = "external-domain"
)

// EncryptionConfig indicates the encryption configuration
// used for TLS connections.
type EncryptionConfig string
Expand Down
6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,7 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/caching v0.0.0-20231120182559-ebc94e6a3cdf
# knative.dev/caching v0.0.0-20231123185038-a65bf6e6e291
## explicit; go 1.18
knative.dev/caching/config
knative.dev/caching/pkg/apis/caching
Expand All @@ -1300,7 +1300,7 @@ knative.dev/caching/pkg/client/listers/caching/v1alpha1
# knative.dev/hack v0.0.0-20231122182901-eb352426ecc1
## explicit; go 1.18
knative.dev/hack
# knative.dev/networking v0.0.0-20231120182743-25da91b5cef2
# knative.dev/networking v0.0.0-20231123185844-bb18aab9ae99
## explicit; go 1.18
knative.dev/networking/config
knative.dev/networking/pkg
Expand Down Expand Up @@ -1339,7 +1339,7 @@ knative.dev/networking/pkg/http/stats
knative.dev/networking/pkg/ingress
knative.dev/networking/pkg/k8s
knative.dev/networking/pkg/prober
# knative.dev/pkg v0.0.0-20231122190403-23f3ee2ee35b
# knative.dev/pkg v0.0.0-20231123185329-ea6ea8440341
## explicit; go 1.18
knative.dev/pkg/apiextensions/storageversion
knative.dev/pkg/apiextensions/storageversion/cmd/migrate
Expand Down

0 comments on commit 9b0d185

Please sign in to comment.