knative
/
func
mirror of https://github.com/knative/func.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade to latest dependencies (#1729) 

bumping knative.dev/eventing 24fbfe5...a9908ef:%0A  > a9908ef Support TLS in PingSource (# 6929)%0A  > df559c0 Fix typo in flags.IsDisbledTransportEncryption name (# 6941)%0A  > 7073cc9 [main] Upgrade to latest dependencies (# 6939)%0A  > c6bc9bb Eventing TLS: Support K_CA_CERTS env variable injection for SinkBinding subjects (# 6931)%0Abumping knative.dev/serving 219285e...fc63583:%0A  > fc63583 Update net-kourier nightly (# 13966)

Signed-off-by: Knative Automation <automation@knative.team>
This commit is contained in:
knative-automation 2023-05-11 08:58:02 -04:00 committed by GitHub
parent ca0c251bb9
commit 4fa785afb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -46,10 +46,10 @@ require (
k8s.io/apimachinery v0.26.1
k8s.io/client-go v1.5.2
knative.dev/client-pkg v0.0.0-20230501131754-e5c405e16e90
knative.dev/eventing v0.37.1-0.20230508163901-24fbfe500ce6
knative.dev/eventing v0.37.1-0.20230510142401-a9908ef95e08
knative.dev/hack v0.0.0-20230501013555-7d81248b4638
knative.dev/pkg v0.0.0-20230502134655-db8a35330281
knative.dev/serving v0.37.1-0.20230508184426-219285e2e258
knative.dev/serving v0.37.1-0.20230509123100-fc635835061e
)
require (

8
go.sum
View File

@ -2529,16 +2529,16 @@ k8s.io/utils v0.0.0-20230115233650-391b47cb4029 h1:L8zDtT4jrxj+TaQYD0k8KNlr556Wa
k8s.io/utils v0.0.0-20230115233650-391b47cb4029/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/client-pkg v0.0.0-20230501131754-e5c405e16e90 h1:1QBZWaLkXsKD2RR0WlEHNt26v7NJt0qLXBJk0/EPlKg=
knative.dev/client-pkg v0.0.0-20230501131754-e5c405e16e90/go.mod h1:oYnznlTBCj/bVEHo5vUSM/VS3oDFNJKDmH5+k1aC9/8=
knative.dev/eventing v0.37.1-0.20230508163901-24fbfe500ce6 h1:9Fk+qYI8hcQ1iQriGGXnispS7j7V/dA4yo9pTkrh8ro=
knative.dev/eventing v0.37.1-0.20230508163901-24fbfe500ce6/go.mod h1:NP5X/LwAkZdoJKI4QWFzIYJxcZVRhVqd25Om9cCV4/Y=
knative.dev/eventing v0.37.1-0.20230510142401-a9908ef95e08 h1:jeBOJps5oexH7ozLjGLjN3Tzz8jhU4IM+nPI5ccyr6I=
knative.dev/eventing v0.37.1-0.20230510142401-a9908ef95e08/go.mod h1:F8sojjRJkGec190/kZiti4eHGWdG5joVF0YUILDtMVs=
knative.dev/hack v0.0.0-20230501013555-7d81248b4638 h1:9IuXHdwp5jNmIg+0LVTQr8o4u0FYD99uCfynM9tS0XY=
knative.dev/hack v0.0.0-20230501013555-7d81248b4638/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/networking v0.0.0-20230504184058-77975a12b2ee h1:d2dytSnwikNVtttk/lTjn7t6A9447DkUXADHR+zLOdU=
knative.dev/networking v0.0.0-20230504184058-77975a12b2ee/go.mod h1:OG9AEepHd3dofzrkzb0IelqN5uzu10RjbSdhl5UruSE=
knative.dev/pkg v0.0.0-20230502134655-db8a35330281 h1:9mN8O5XO68DKlkzEhFAShUx+O/I+TQR71vmTvYt8oF4=
knative.dev/pkg v0.0.0-20230502134655-db8a35330281/go.mod h1:2qWPP9Gjh9Q7ETti+WRHnBnGCSCq+6q7m3p/nmUQviE=
knative.dev/serving v0.37.1-0.20230508184426-219285e2e258 h1:lT0bOZsyip5ACQ8AG1TyHg4V2yncDQCoy8MC6SbdMVE=
knative.dev/serving v0.37.1-0.20230508184426-219285e2e258/go.mod h1:LaiMt6wVwLU2i81MJSUh3LCHCBjCYuT9EY2ssY1oFlw=
knative.dev/serving v0.37.1-0.20230509123100-fc635835061e h1:cdrAXpkfmE87ZOBwXODdmHwP2sUzttL7hEZ1cx/bDWo=
knative.dev/serving v0.37.1-0.20230509123100-fc635835061e/go.mod h1:LaiMt6wVwLU2i81MJSUh3LCHCBjCYuT9EY2ssY1oFlw=
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=

4
vendor/knative.dev/eventing/pkg/apis/feature/features.go vendored
View File

@ -71,8 +71,8 @@ func (e Flags) IsStrictTransportEncryption() bool {
return e != nil && e[TransportEncryption] == Strict
}
// IsDisbledTransportEncryption returns true if the TransportEncryption feature is in Disabled mode.
func (e Flags) IsDisbledTransportEncryption() bool {
// IsDisabledTransportEncryption returns true if the TransportEncryption feature is in Disabled mode.
func (e Flags) IsDisabledTransportEncryption() bool {
return e != nil && e[TransportEncryption] == Disabled
}

6
vendor/knative.dev/eventing/pkg/apis/sources/v1/ping_lifecycle.go vendored
View File

@ -23,6 +23,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
)
const (
@ -86,9 +87,10 @@ func (s *PingSourceStatus) InitializeConditions() {
}
// MarkSink sets the condition that the source has a sink configured.
func (s *PingSourceStatus) MarkSink(uri *apis.URL) {
s.SinkURI = uri
func (s *PingSourceStatus) MarkSink(uri *duckv1.Addressable) {
if uri != nil {
s.SinkURI = uri.URL
s.SinkCACerts = uri.CACerts
PingSourceCondSet.Manage(s).MarkTrue(PingSourceConditionSinkProvided)
} else {
PingSourceCondSet.Manage(s).MarkFalse(PingSourceConditionSinkProvided, "SinkEmpty", "Sink has resolved to empty.")

31
vendor/knative.dev/eventing/pkg/apis/sources/v1/sinkbinding_lifecycle.go vendored
View File

@ -85,9 +85,10 @@ func (sbs *SinkBindingStatus) MarkBindingAvailable() {
}
// MarkSink sets the condition that the source has a sink configured.
func (sbs *SinkBindingStatus) MarkSink(uri *apis.URL) {
sbs.SinkURI = uri
if uri != nil {
func (sbs *SinkBindingStatus) MarkSink(addr *duckv1.Addressable) {
if addr != nil {
sbs.SinkURI = addr.URL
sbs.SinkCACerts = addr.CACerts
sbCondSet.Manage(sbs).MarkTrue(SinkBindingConditionSinkProvided)
} else {
sbCondSet.Manage(sbs).MarkFalse(SinkBindingConditionSinkProvided, "SinkEmpty", "Sink has resolved to empty.%s", "")
@ -104,12 +105,12 @@ func (sb *SinkBinding) Do(ctx context.Context, ps *duckv1.WithPod) {
logging.FromContext(ctx).Errorf("No Resolver associated with context for sink: %+v", sb)
return
}
uri, err := resolver.URIFromDestinationV1(ctx, sb.Spec.Sink, sb)
addr, err := resolver.AddressableFromDestinationV1(ctx, sb.Spec.Sink, sb)
if err != nil {
logging.FromContext(ctx).Errorw("URI could not be extracted from destination: ", zap.Error(err))
return
}
sb.Status.MarkSink(uri)
sb.Status.MarkSink(addr)
var ceOverrides string
if sb.Spec.CloudEventOverrides != nil {
@ -124,8 +125,14 @@ func (sb *SinkBinding) Do(ctx context.Context, ps *duckv1.WithPod) {
for i := range spec.InitContainers {
spec.InitContainers[i].Env = append(spec.InitContainers[i].Env, corev1.EnvVar{
Name: "K_SINK",
Value: uri.String(),
Value: addr.URL.String(),
})
if addr.CACerts != nil {
spec.InitContainers[i].Env = append(spec.InitContainers[i].Env, corev1.EnvVar{
Name: "K_CA_CERTS",
Value: *addr.CACerts,
})
}
spec.InitContainers[i].Env = append(spec.InitContainers[i].Env, corev1.EnvVar{
Name: "K_CE_OVERRIDES",
Value: ceOverrides,
@ -134,8 +141,14 @@ func (sb *SinkBinding) Do(ctx context.Context, ps *duckv1.WithPod) {
for i := range spec.Containers {
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
Name: "K_SINK",
Value: uri.String(),
Value: addr.URL.String(),
})
if addr.CACerts != nil {
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
Name: "K_CA_CERTS",
Value: *addr.CACerts,
})
}
spec.Containers[i].Env = append(spec.Containers[i].Env, corev1.EnvVar{
Name: "K_CE_OVERRIDES",
Value: ceOverrides,
@ -152,7 +165,7 @@ func (sb *SinkBinding) Undo(ctx context.Context, ps *duckv1.WithPod) {
env := make([]corev1.EnvVar, 0, len(spec.InitContainers[i].Env))
for j, ev := range c.Env {
switch ev.Name {
case "K_SINK", "K_CE_OVERRIDES":
case "K_SINK", "K_CE_OVERRIDES", "K_CA_CERTS":
continue
default:
env = append(env, spec.InitContainers[i].Env[j])
@ -167,7 +180,7 @@ func (sb *SinkBinding) Undo(ctx context.Context, ps *duckv1.WithPod) {
env := make([]corev1.EnvVar, 0, len(spec.Containers[i].Env))
for j, ev := range c.Env {
switch ev.Name {
case "K_SINK", "K_CE_OVERRIDES":
case "K_SINK", "K_CE_OVERRIDES", "K_CA_CERTS":
continue
default:
env = append(env, spec.Containers[i].Env[j])

4
vendor/modules.txt vendored
View File

@ -1685,7 +1685,7 @@ knative.dev/client-pkg/pkg/serving/v1
knative.dev/client-pkg/pkg/util
knative.dev/client-pkg/pkg/util/test
knative.dev/client-pkg/pkg/wait
# knative.dev/eventing v0.37.1-0.20230508163901-24fbfe500ce6
# knative.dev/eventing v0.37.1-0.20230510142401-a9908ef95e08
## explicit; go 1.19
knative.dev/eventing/pkg/apis/config
knative.dev/eventing/pkg/apis/duck
@ -1764,7 +1764,7 @@ knative.dev/pkg/tracing/propagation
knative.dev/pkg/tracing/propagation/tracecontextb3
knative.dev/pkg/tracker
knative.dev/pkg/webhook/resourcesemantics
# knative.dev/serving v0.37.1-0.20230508184426-219285e2e258
# knative.dev/serving v0.37.1-0.20230509123100-fc635835061e
## explicit; go 1.18
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1