Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history
bumping knative.dev/pkg c5dd1d1...53f04b3:%0A  > 53f04b3 Make minimum TLS version configurable for webhooks (# 2721)%0A  > ce10b06 Update actions (# 2726)%0A  > d3d7625 Update community files (# 2724)%0A  > 166893c upgrade to latest dependencies (# 2719)%0A  > ef19121 Update community files (# 2722)%0A  > 15cf17d Update actions (# 2720)%0A  > ee73c93 upgrade to latest dependencies (# 2710)%0A  > 4835a4c Eventing TLS: update destination and Kref types (# 2716)%0A  > b7f2774 Made changes to addressable and address status. (# 2713)%0A  > 696cac8 Expose queue proxy request metrics reporting period (# 2362)%0A  > bd3cf51 Printf log message with the right type when showing port (# 2709)%0A  > 4c84b1b Update actions (# 2707)%0A  > 3290ddf Update community files (# 2706)%0A  > 53fc6ab Update actions (# 2705)%0A  > b769fef drop eventing natss from downstream tests (# 2703)%0A  > 511b394 potential fix for flakey tlsBackoff (# 2702)%0A  > 0902ea8 Parameterize WEBHOOK_NAME env key in error message (# 2701)%0Abumping knative.dev/eventing 05f6d84...d89300c:%0A  > d89300c [release-1.9] SC settings for ApiServerSource's Receive Adapter's container/deployment  (# 6792)%0A  > f634181 [release-1.9] Fixes issue where a CE response is truncated (# 6784)%0A  > 4e6fff4 [release-1.9] Upgrade to latest dependencies (# 6775)%0A  > 53f6385 [release-1.9] Exclusive access to tracing flag for upgrade prober (# 6768)%0A  > 1a221ab [release-1.9] Extract scheduler config in a dedicate struct instead of many parameters (# 6740)%0A  > 4efda71 [release-1.9] Add function to check if a broker resource is `NotReady` (# 6738)%0A  > 2fa7b47 [release-1.9] Improve scheduler logging for state and pending vpods (# 6734)%0A  > d4dde69 [release-1.9] Scheduler doesn't reschedule vpods that are scheduled on unscehdulable pods (# 6730)%0A  > 5a0ac4c [release-1.9] Revert "Change subscription patch logic to ensure resource version (# 6670) (# 6725)%0A  > f6cce6b [release-1.9] Install source at requirement phase in conformance tests (# 6713)%0A  > c0dcda3 [release-1.9] Set scheduler logging to debug (# 6714)%0A  > d46e08b [release-1.9] Format Go code (# 6706)%0Abumping knative.dev/reconciler-test d52257e...06956b6:%0A  > 06956b6 Update actions (# 509)%0A  > dc3cb16 Update actions (# 506)%0A  > 40da5d5 upgrade to latest dependencies (# 505)%0A  > b6650ee Update community files (# 508)%0A  > 4b8e2c0 Update community files (# 507)%0A  > 089a08c upgrade to latest dependencies (# 501)%0A  > 9e0512f Quote label and selector values (# 504)%0A  > e88bcc9 Quote label values for cronjob (# 503)%0A  > 19c9bb5 Support setting Job labels for cron jobs (# 502)%0A  > 805bcaa Update actions (# 500)%0A  > 7f6a81c Update actions (# 499)%0A  > 04a4c0a Update community files (# 498)%0Abumping knative.dev/hack 3de51af...4b3f230:%0A  > 4b3f230 Update community files (# 283)%0A  > 9153cc6 Update community files (# 282)%0A  > 359d585 Revert "Extract tools to knative.dev/toolbox (# 280)" (# 281)%0A  > 1421f12 Extract tools to knative.dev/toolbox (# 280)%0A  > 3b8ef01 Update community files (# 279)%0A  > 1eebfb3 Update community files (# 278)

Signed-off-by: Knative Automation <automation@knative.team>
  • Loading branch information
knative-automation committed Apr 17, 2023
1 parent ec3ad88 commit 15f1ede
Show file tree
Hide file tree
Showing 50 changed files with 1,103 additions and 657 deletions.
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ require (
github.com/davecgh/go-spew v1.1.1
github.com/google/gofuzz v1.2.0
github.com/kedacore/keda/v2 v2.8.1
knative.dev/eventing v0.36.1-0.20230309084530-05f6d84ad43c
knative.dev/hack v0.0.0-20230228173453-3de51aff69a3
knative.dev/pkg v0.0.0-20230309013522-c5dd1d1264ba
knative.dev/reconciler-test v0.0.0-20230307080119-d52257e4e606
knative.dev/eventing v0.36.7
knative.dev/hack v0.0.0-20230412013450-4b3f2300c1ad
knative.dev/pkg v0.0.0-20230414154551-53f04b373cc9
knative.dev/reconciler-test v0.0.0-20230413132853-06956b6259d6
sigs.k8s.io/controller-runtime v0.12.3
)

Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1518,14 +1518,14 @@ k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8=
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/eventing v0.36.1-0.20230309084530-05f6d84ad43c h1:idpDTj8ipzWAy7kDZSq3uk4taQoOAAWJGKt84ScmqhE=
knative.dev/eventing v0.36.1-0.20230309084530-05f6d84ad43c/go.mod h1:8mo69M3WWCQWNyWb2G+g2Jyeh8eDOiQud4Xd8jLr57Q=
knative.dev/hack v0.0.0-20230228173453-3de51aff69a3 h1:Jt3n+AZsZHZaFhk/A1NnboAvgjV+hvvyeyyuIX/hUx0=
knative.dev/hack v0.0.0-20230228173453-3de51aff69a3/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/pkg v0.0.0-20230309013522-c5dd1d1264ba h1:THY9ox1maZNYcmvYBJ3hhtjqHp9Ci0fDsF1t+GIoiOo=
knative.dev/pkg v0.0.0-20230309013522-c5dd1d1264ba/go.mod h1:S+KfTInuwEkZSTwvWqrWZV/TEw6ps51GUGaSC1Fnbe0=
knative.dev/reconciler-test v0.0.0-20230307080119-d52257e4e606 h1:gJY32/uUublG1WSFH0QDstxE3aEQiU61JLr+t0uLp5c=
knative.dev/reconciler-test v0.0.0-20230307080119-d52257e4e606/go.mod h1:2472v1Zg0stETnG6t2qpnyiJadgOJHb2iLaAgiOHa68=
knative.dev/eventing v0.36.7 h1:4Rm60LOc9PMh5IXn17iLbVpO0R8i+/1M3Wh8Dpsq3s8=
knative.dev/eventing v0.36.7/go.mod h1:KYXv6I8okKVrCq1EZXlGH+BZhbBEI7TQF86MaDvp7DM=
knative.dev/hack v0.0.0-20230412013450-4b3f2300c1ad h1:+5MpC265m9pjmJl+popG9XO9G1l+Rq1py9ldqBHwA68=
knative.dev/hack v0.0.0-20230412013450-4b3f2300c1ad/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/pkg v0.0.0-20230414154551-53f04b373cc9 h1:ZozlfXh+jwr+KE/C60thPDOdAVQ3MNRfdsFHbajHIRk=
knative.dev/pkg v0.0.0-20230414154551-53f04b373cc9/go.mod h1:Xa/jM3LpUnfQabS0kKR9sMTaDn4absCVvwkdNlwRwHc=
knative.dev/reconciler-test v0.0.0-20230413132853-06956b6259d6 h1:zUBZkr9kTSzYBasHZw2WnMcBJy5COZS5Xau9ThmByFo=
knative.dev/reconciler-test v0.0.0-20230413132853-06956b6259d6/go.mod h1:JwK7KUivj9TX7gJ6SAFfNxhmAfYc45kyASeRT8OG+pM=
pgregory.net/rapid v0.3.3 h1:jCjBsY4ln4Atz78QoBWxUEvAHaFyNDQg9+WU62aCn1U=
pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
78 changes: 1 addition & 77 deletions vendor/knative.dev/eventing/cmd/event_display/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,11 @@ limitations under the License.
package main

import (
"bytes"
"context"
"encoding/json"
"fmt"
"io"
"log"
"net/http"
"net/url"
"os"
"strconv"

"github.com/cloudevents/sdk-go/observability/opencensus/v2/client"
cloudevents "github.com/cloudevents/sdk-go/v2"
Expand Down Expand Up @@ -70,17 +65,8 @@ func main() {
}

func run(ctx context.Context) {

requestLoggingEnabled, _ := strconv.ParseBool(os.Getenv("REQUEST_LOGGING_ENABLED"))
if requestLoggingEnabled {
log.Println("Request logging enabled, request logging is not recommended for production since it might log sensitive information")
}

c, err := client.NewClientHTTP(
[]cehttp.Option{
cehttp.WithMiddleware(healthzMiddleware),
cehttp.WithMiddleware(requestLoggingMiddleware(requestLoggingEnabled)),
}, nil,
[]cehttp.Option{cehttp.WithMiddleware(healthzMiddleware)}, nil,
)
if err != nil {
log.Fatal("Failed to create client: ", err)
Expand Down Expand Up @@ -113,65 +99,3 @@ func healthzMiddleware(next http.Handler) http.Handler {
}
})
}

// requestLoggingMiddleware is a cehttp.Middleware which logs incoming requests.
func requestLoggingMiddleware(enabled bool) func(next http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
if enabled {
logRequest(req)
}
next.ServeHTTP(w, req)
})
}
}

type LoggableRequest struct {
Method string `json:"method,omitempty"`
URL *url.URL `json:"URL,omitempty"`
Proto string `json:"proto,omitempty"`
ProtoMajor int `json:"protoMajor,omitempty"`
ProtoMinor int `json:"protoMinor,omitempty"`
Header http.Header `json:"headers,omitempty"`
Body string `json:"body,omitempty"`
ContentLength int64 `json:"contentLength,omitempty"`
TransferEncoding []string `json:"transferEncoding,omitempty"`
Host string `json:"host,omitempty"`
Trailer http.Header `json:"trailer,omitempty"`
RemoteAddr string `json:"remoteAddr"`
RequestURI string `json:"requestURI"`
}

func logRequest(req *http.Request) {
b, err := json.MarshalIndent(toReq(req), "", " ")
if err != nil {
log.Println("failed to marshal request", err)
}

log.Println(string(b))
}

func toReq(req *http.Request) LoggableRequest {
body, err := io.ReadAll(req.Body)
if err != nil {
log.Println("failed to read request body")
}
_ = req.Body.Close()
// Replace the body with a new reader after reading from the original
req.Body = io.NopCloser(bytes.NewBuffer(body))
return LoggableRequest{
Method: req.Method,
URL: req.URL,
Proto: req.Proto,
ProtoMajor: req.ProtoMajor,
ProtoMinor: req.ProtoMinor,
Header: req.Header,
Body: string(body),
ContentLength: req.ContentLength,
TransferEncoding: req.TransferEncoding,
Host: req.Host,
Trailer: req.Trailer,
RemoteAddr: req.RemoteAddr,
RequestURI: req.RequestURI,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ type ChannelableStatus struct {
// resolved delivery options.
// +optional
DeliveryStatus `json:",inline"`
// DeadLetterChannel is a KReference and is set by the channel when it supports native error handling via a channel
// Failed messages are delivered here.
// Deprecated in favor of DeliveryStatus, to be removed September 2022.
// +optional
DeadLetterChannel *duckv1.KReference `json:"deadLetterChannel,omitempty"`
}

var (
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,5 @@ func (ss *SubscriptionSpec) SetDefaults(ctx context.Context) {
if ss == nil {
return
}

ss.Subscriber.SetDefaults(ctx)
ss.Reply.SetDefaults(ctx)
ss.Delivery.SetDefaults(ctx)
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions vendor/knative.dev/eventing/pkg/duck/listable.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ import (
"context"
"fmt"
"sync"
"time"

"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/cache"
"knative.dev/pkg/apis/duck"
duckv1 "knative.dev/pkg/apis/duck/v1"
Expand Down Expand Up @@ -55,6 +57,12 @@ type ListableTracker interface {
type Track func(corev1.ObjectReference) error
type TrackKReference func(duckv1.KReference) error

// NewListableTracker creates a new ListableTracker, backed by a TypedInformerFactory.
// Deprecated: use NewListableTrackerFromTracker instead.
func NewListableTracker(ctx context.Context, getter func(context.Context) duck.InformerFactory, callback func(types.NamespacedName), lease time.Duration) ListableTracker {
return NewListableTrackerFromTracker(ctx, getter, tracker.New(callback, lease))
}

// NewListableTrackerFromTracker creates a new ListableTracker, backed by a TypedInformerFactory.
func NewListableTrackerFromTracker(ctx context.Context, getter func(context.Context) duck.InformerFactory, t tracker.Interface) ListableTracker {
return &listableTracker{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ type HTTPMessageSender struct {
Target string
}

// Deprecated: Don't use this anymore, now it has the same effect of NewHTTPMessageSenderWithTarget
// If you need to modify the connection args, use ConfigureConnectionArgs sparingly.
func NewHTTPMessageSender(ca *ConnectionArgs, target string) (*HTTPMessageSender, error) {
return NewHTTPMessageSenderWithTarget(target)
}

func NewHTTPMessageSenderWithTarget(target string) (*HTTPMessageSender, error) {
return &HTTPMessageSender{Client: getClient(), Target: target}, nil
}
Expand Down
23 changes: 4 additions & 19 deletions vendor/knative.dev/eventing/pkg/utils/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,26 +66,11 @@ func CopySecret(corev1Input clientcorev1.CoreV1Interface, srcNS string, srcSecre
return nil, fmt.Errorf("error copying the Secret: %s", err)
}

tgtSvcAccount, err := tgtNamespaceSvcAcct.Get(context.Background(), svcAccount, metav1.GetOptions{})
_, err = tgtNamespaceSvcAcct.Patch(context.Background(), svcAccount, types.StrategicMergePatchType,
[]byte(`{"imagePullSecrets":[{"name":"`+srcSecretName+`"}]}`), metav1.PatchOptions{})
if err != nil {
return nil, fmt.Errorf("error getting service account %s: %w", svcAccount, err)
}

for _, secret := range tgtSvcAccount.ImagePullSecrets {
if secret.Name == srcSecretName {
return newSecret, nil
}
}
// Prevent overwriting existing imagePullSecrets
patch := `[{"op":"add","path":"/imagePullSecrets/-","value":{"name":"` + srcSecretName + `"}}]`
if len(tgtSvcAccount.ImagePullSecrets) == 0 {
patch = `[{"op":"add","path":"/imagePullSecrets","value":[{"name":"` + srcSecretName + `"}]}]`
}
_, err = tgtNamespaceSvcAcct.Patch(context.Background(), svcAccount, types.JSONPatchType,
[]byte(patch), metav1.PatchOptions{})
if err != nil {
return nil, fmt.Errorf("patch failed on NS/SA (%s/%s): %w",
tgtNS, svcAccount, err)
return nil, fmt.Errorf("patch failed on NS/SA (%s/%s): %s",
tgtNS, srcSecretName, err)
}
return newSecret, nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ package helpers

import (
"context"
"strings"
"testing"

cloudevents "github.com/cloudevents/sdk-go/v2"
. "github.com/cloudevents/sdk-go/v2/test"
"github.com/google/uuid"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

testlib "knative.dev/eventing/test/lib"
"knative.dev/eventing/test/lib/recordevents"
Expand All @@ -46,7 +44,6 @@ EventSource ---> Broker ---> Trigger1 -------> Service(Transformation)
Note: the number denotes the sequence of the event that flows in this test case.
*/
// Deprecated, use reconciler-test based tests.
func EventTransformationForTriggerTestHelper(
ctx context.Context,
t *testing.T,
Expand Down Expand Up @@ -133,28 +130,3 @@ func EventTransformationForTriggerTestHelper(
HasData([]byte(eventBody)),
))
}

// BrokerCreator creates a broker and returns its broker name.
type BrokerCreator func(client *testlib.Client, version string) string

// ChannelBasedBrokerCreator creates a BrokerCreator that creates a broker based on the channel parameter.
func ChannelBasedBrokerCreator(channel metav1.TypeMeta, brokerClass string) BrokerCreator {
return func(client *testlib.Client, version string) string {
brokerName := strings.ToLower(channel.Kind)

// create a ConfigMap used by the broker.
config := client.CreateBrokerConfigMapOrFail("config-"+brokerName, &channel)

switch version {
case "v1":
client.CreateBrokerOrFail(brokerName,
resources.WithBrokerClassForBroker(brokerClass),
resources.WithConfigForBroker(config),
)
default:
panic("unknown version: " + version)
}

return brokerName
}
}

0 comments on commit 15f1ede

Please sign in to comment.