Skip to content

Commit 929037b

Browse files
upgrade to latest dependencies (knative-extensions#1214)
bumping knative.dev/pkg 97c7258...ea6ea84: > ea6ea84 upgrade to latest dependencies (# 2901) > 23f3ee2 Bump google.golang.org/api from 0.150.0 to 0.151.0 (# 2899) > 703c8b0 Add consistent SECURITY.md (# 2900) bumping knative.dev/networking 3af9769...bb18aab: > bb18aab Add additional encryption config flags + labels (# 891) > a509117 upgrade to latest dependencies (# 895) > 25da91b Add consistent SECURITY.md (# 894) bumping google.golang.org/api 83b8a6c...df9c71c: > df9c71c chore(main): release 0.151.0 (# 2254) > 786dca6 feat(all): auto-regenerate discovery clients (# 2265) > 3e83ea6 feat(all): auto-regenerate discovery clients (# 2263) > 93f5a5b feat(all): auto-regenerate discovery clients (# 2262) > edb9d86 feat(all): auto-regenerate discovery clients (# 2261) > 33863bf feat(all): auto-regenerate discovery clients (# 2259) > efe3d6f feat(all): auto-regenerate discovery clients (# 2258) > b3fe441 feat(all): auto-regenerate discovery clients (# 2257) > 4024760 feat(all): auto-regenerate discovery clients (# 2256) > 10dbf2b feat(all): auto-regenerate discovery clients (# 2255) > 58f1c94 feat(all): auto-regenerate discovery clients (# 2253) bumping knative.dev/hack 5deadde...eb35242: > eb35242 Adding the variable `KNATIVE_EVENTING_RELEASE_TLS` to install latest eventing TLS (# 350) Signed-off-by: Knative Automation <automation@knative.team>
1 parent 3150a38 commit 929037b

File tree

7 files changed

+90
-22
lines changed

7 files changed

+90
-22
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ require (
2020
k8s.io/api v0.28.2
2121
k8s.io/apimachinery v0.28.2
2222
k8s.io/client-go v0.28.2
23-
knative.dev/hack v0.0.0-20231109190034-5deaddeb51a7
24-
knative.dev/networking v0.0.0-20231115015815-3af9769712cd
25-
knative.dev/pkg v0.0.0-20231115001034-97c7258e3a98
23+
knative.dev/hack v0.0.0-20231122182901-eb352426ecc1
24+
knative.dev/networking v0.0.0-20231123185844-bb18aab9ae99
25+
knative.dev/pkg v0.0.0-20231123185329-ea6ea8440341
2626
)
2727

2828
require (
@@ -84,7 +84,7 @@ require (
8484
golang.org/x/time v0.3.0 // indirect
8585
golang.org/x/tools v0.15.0 // indirect
8686
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
87-
google.golang.org/api v0.150.0 // indirect
87+
google.golang.org/api v0.151.0 // indirect
8888
google.golang.org/appengine v1.6.7 // indirect
8989
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
9090
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,8 @@ google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M
554554
google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
555555
google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
556556
google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
557-
google.golang.org/api v0.150.0 h1:Z9k22qD289SZ8gCJrk4DrWXkNjtfvKAUo/l1ma8eBYE=
558-
google.golang.org/api v0.150.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg=
557+
google.golang.org/api v0.151.0 h1:FhfXLO/NFdJIzQtCqjpysWwqKk8AzGWBUhMIx67cVDU=
558+
google.golang.org/api v0.151.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg=
559559
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
560560
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
561561
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -685,12 +685,12 @@ k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5F
685685
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
686686
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
687687
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
688-
knative.dev/hack v0.0.0-20231109190034-5deaddeb51a7 h1:HXf7M7n9jwn+Hp904r0HXRSymf+DLXSciFpXVpCg+Bs=
689-
knative.dev/hack v0.0.0-20231109190034-5deaddeb51a7/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
690-
knative.dev/networking v0.0.0-20231115015815-3af9769712cd h1:VDtYz+hybqIAEp8NM2tAi2QV4D8Cc5DWLoXLi5IcZjE=
691-
knative.dev/networking v0.0.0-20231115015815-3af9769712cd/go.mod h1:HQ3rA7qrKVWvZUl6GGQefn/PzNXlX4e94KpbwBEjFcQ=
692-
knative.dev/pkg v0.0.0-20231115001034-97c7258e3a98 h1:uvOLwp5Ar7oJlaYEszh51CemuZc1sRRI14xzKhUEF3U=
693-
knative.dev/pkg v0.0.0-20231115001034-97c7258e3a98/go.mod h1:56Qcm0ai7xPWqGxpOnjRi4sAX9fZM9UDTk7fKyjUqZM=
688+
knative.dev/hack v0.0.0-20231122182901-eb352426ecc1 h1:ZUkFAaq5gEls7bJ2ADLg+ZJVtN3KUcHEWx5ngLfacuQ=
689+
knative.dev/hack v0.0.0-20231122182901-eb352426ecc1/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
690+
knative.dev/networking v0.0.0-20231123185844-bb18aab9ae99 h1:LFBdYo3YPRH5LwZpQSLrcL0vhzL7zKrI93Mfa+PxkEw=
691+
knative.dev/networking v0.0.0-20231123185844-bb18aab9ae99/go.mod h1:ESsvanBOBBkDxO1qa9mlBhV5yoBH1svcpy/dVmBNdJw=
692+
knative.dev/pkg v0.0.0-20231123185329-ea6ea8440341 h1:GVSTPofS7DbTTxoJw4TwfxNWCzH4QcSI5jm4F7tgDPE=
693+
knative.dev/pkg v0.0.0-20231123185329-ea6ea8440341/go.mod h1:uOiSmQ4t36/4qxaY+hrrgrNNNkDqj6BGZVjtV+cQ+V4=
694694
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
695695
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
696696
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

vendor/knative.dev/hack/library.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,3 +1031,4 @@ readonly KNATIVE_SERVING_RELEASE_CRDS="$(get_latest_knative_yaml_source "serving
10311031
readonly KNATIVE_SERVING_RELEASE_CORE="$(get_latest_knative_yaml_source "serving" "serving-core")"
10321032
readonly KNATIVE_NET_ISTIO_RELEASE="$(get_latest_knative_yaml_source "net-istio" "net-istio")"
10331033
readonly KNATIVE_EVENTING_RELEASE="$(get_latest_knative_yaml_source "eventing" "eventing")"
1034+
readonly KNATIVE_EVENTING_RELEASE_TLS="$(get_latest_knative_yaml_source "eventing" "eventing-tls-networking")"

vendor/knative.dev/networking/pkg/apis/networking/register.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ const (
119119
// already using labels for domain, it probably best to keep this
120120
// consistent.
121121
VisibilityLabelKey = PublicGroupName + "/visibility"
122+
123+
// CertificateTypeLabelKey is the label to indicate the type of Knative certificate
124+
// used for Knative Serving encryption functionality. Corresponding values are defined in config.CertificateType.
125+
CertificateTypeLabelKey = PublicGroupName + "/certificate-type"
122126
)
123127

124128
// Pseudo-constants
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/*
2+
Copyright 2023 The Knative Authors
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package v1alpha1
18+
19+
import (
20+
"slices"
21+
)
22+
23+
// GetIngressTLSForVisibility returns a list of `Spec.TLS` where each host in the `Rules.Hosts` field is
24+
// present in `Spec.TLS.Hosts` and where the Rules have the defined ingress visibility.
25+
// This method can be used in net-* implementations to select the correct `IngressTLS` entries
26+
// for cluster-local and cluster-external gateways/listeners.
27+
func (i *Ingress) GetIngressTLSForVisibility(visibility IngressVisibility) []IngressTLS {
28+
ingressTLS := make([]IngressTLS, 0, len(i.Spec.TLS))
29+
30+
if i.Spec.TLS == nil || len(i.Spec.TLS) == 0 {
31+
return ingressTLS
32+
}
33+
34+
for _, rule := range i.Spec.Rules {
35+
if rule.Visibility == visibility {
36+
if rule.Hosts == nil || len(rule.Hosts) == 0 {
37+
return ingressTLS
38+
}
39+
40+
for _, tls := range i.Spec.TLS {
41+
containsAllRuleHosts := true
42+
for _, h := range rule.Hosts {
43+
if !slices.Contains(tls.Hosts, h) {
44+
containsAllRuleHosts = false
45+
}
46+
}
47+
if containsAllRuleHosts {
48+
ingressTLS = append(ingressTLS, tls)
49+
}
50+
}
51+
}
52+
}
53+
54+
return ingressTLS
55+
}

vendor/knative.dev/networking/pkg/config/config.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@ const (
6767
// Certificate reconciler.
6868
CertManagerCertificateClassName = "cert-manager.certificate.networking.knative.dev"
6969

70-
// ServingInternalCertName is the name of secret contains certificates in serving
71-
// system namespace.
72-
//
73-
// Deprecated: ServingInternalCertName is deprecated. Use ServingRoutingCertName instead.
74-
ServingInternalCertName = "knative-serving-certs"
75-
7670
// ServingRoutingCertName is the name of secret contains certificates for Routing data in serving
7771
// system namespace. (Used by Ingress GWs and Activator)
7872
ServingRoutingCertName = "routing-serving-certs"
@@ -148,6 +142,20 @@ const (
148142
SystemInternalTLSKey = "system-internal-tls"
149143
)
150144

145+
// CertificateType indicates the type of Knative Certificate.
146+
type CertificateType string
147+
148+
const (
149+
// CertificateSystemInternal defines a certificate used for `system-internal-tls`.
150+
CertificateSystemInternal CertificateType = "system-internal"
151+
152+
// CertificateClusterLocalDomain defines a certificate used for `cluster-local-domain-tls`.
153+
CertificateClusterLocalDomain CertificateType = "cluster-local-domain"
154+
155+
// CertificateExternalDomain defines a cerificate used for `external-domain-tls`.
156+
CertificateExternalDomain CertificateType = "external-domain"
157+
)
158+
151159
// EncryptionConfig indicates the encryption configuration
152160
// used for TLS connections.
153161
type EncryptionConfig string

vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ golang.org/x/tools/internal/typeparams
280280
# gomodules.xyz/jsonpatch/v2 v2.4.0
281281
## explicit; go 1.20
282282
gomodules.xyz/jsonpatch/v2
283-
# google.golang.org/api v0.150.0
283+
# google.golang.org/api v0.151.0
284284
## explicit; go 1.19
285285
google.golang.org/api/support/bundler
286286
# google.golang.org/appengine v1.6.7
@@ -917,10 +917,10 @@ k8s.io/utils/net
917917
k8s.io/utils/pointer
918918
k8s.io/utils/strings/slices
919919
k8s.io/utils/trace
920-
# knative.dev/hack v0.0.0-20231109190034-5deaddeb51a7
920+
# knative.dev/hack v0.0.0-20231122182901-eb352426ecc1
921921
## explicit; go 1.18
922922
knative.dev/hack
923-
# knative.dev/networking v0.0.0-20231115015815-3af9769712cd
923+
# knative.dev/networking v0.0.0-20231123185844-bb18aab9ae99
924924
## explicit; go 1.18
925925
knative.dev/networking/config
926926
knative.dev/networking/pkg
@@ -971,7 +971,7 @@ knative.dev/networking/test/test_images/runtime/handlers
971971
knative.dev/networking/test/test_images/timeout
972972
knative.dev/networking/test/test_images/wsserver
973973
knative.dev/networking/test/types
974-
# knative.dev/pkg v0.0.0-20231115001034-97c7258e3a98
974+
# knative.dev/pkg v0.0.0-20231123185329-ea6ea8440341
975975
## explicit; go 1.18
976976
knative.dev/pkg/apis
977977
knative.dev/pkg/apis/duck

0 commit comments

Comments
 (0)