Skip to content

Commit 85de3c9

Browse files
upgrade to latest dependencies (#421)
bumping knative.dev/hack b9801b4...c7cfcb0: > c7cfcb0 Update community files (# 263) > af8745e Update community files (# 262) > cf3796d Upload attestations and print cosign version (# 261) bumping knative.dev/pkg 4fd6eb8...247510c: > 247510c upgrade to latest dependencies (# 2668) > 876c59d Update actions (# 2667) > 8abadb0 Update community files (# 2666) > ecf3863 Simplify the test/upgrade package (# 2663) > 50da24e upgrade to latest dependencies (# 2665) > dc20e47 Update community files (# 2664) > 0274825 Allow logstream to stream logs from user namespace (# 2591) Signed-off-by: Knative Automation <[email protected]> Signed-off-by: Knative Automation <[email protected]>
1 parent 99fc565 commit 85de3c9

File tree

23 files changed

+715
-48
lines changed

23 files changed

+715
-48
lines changed

go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module knative.dev/eventing-redis
33
go 1.18
44

55
require (
6-
github.com/cloudevents/sdk-go/v2 v2.12.0
6+
github.com/cloudevents/sdk-go/v2 v2.13.0
77
github.com/go-redis/redis/v8 v8.11.4
88
github.com/gomodule/redigo v1.8.3
99
github.com/google/go-cmp v0.5.8
@@ -13,10 +13,10 @@ require (
1313
k8s.io/api v0.25.4
1414
k8s.io/apimachinery v0.25.4
1515
k8s.io/client-go v0.25.4
16-
knative.dev/eventing v0.35.1-0.20221222110658-271c9bb53a52
17-
knative.dev/hack v0.0.0-20221209013717-b9801b4f5a4d
18-
knative.dev/pkg v0.0.0-20221221230956-4fd6eb8652b7
19-
knative.dev/serving v0.35.1-0.20221220012254-3b8f17cd6f97
16+
knative.dev/eventing v0.36.0
17+
knative.dev/hack v0.0.0-20230113013652-c7cfcb062de9
18+
knative.dev/pkg v0.0.0-20230117181655-247510c00e9d
19+
knative.dev/serving v0.36.0
2020
)
2121

2222
require (
@@ -36,8 +36,8 @@ require (
3636
github.com/blendle/zapdriver v1.3.1 // indirect
3737
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
3838
github.com/cespare/xxhash/v2 v2.1.2 // indirect
39-
github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.12.0 // indirect
40-
github.com/cloudevents/sdk-go/sql/v2 v2.0.0-20220930150014-52b12276cc4a // indirect
39+
github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.13.0 // indirect
40+
github.com/cloudevents/sdk-go/sql/v2 v2.13.0 // indirect
4141
github.com/davecgh/go-spew v1.1.1 // indirect
4242
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
4343
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
@@ -110,7 +110,7 @@ require (
110110
k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54 // indirect
111111
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
112112
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
113-
knative.dev/networking v0.0.0-20221202133217-891aac251fc2 // indirect
113+
knative.dev/networking v0.0.0-20230123233838-db2bcbea2560 // indirect
114114
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
115115
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
116116
sigs.k8s.io/yaml v1.3.0 // indirect

go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR
100100
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
101101
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
102102
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
103-
github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.12.0 h1:iMJy7/VX/+/ZImJo7dffvg/ZPwrp4PprnnyKPK1mOok=
104-
github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.12.0/go.mod h1:g7VsRXXYILOchM36AReyfd2bJFJyyE+PMuYa65CxjGo=
105-
github.com/cloudevents/sdk-go/sql/v2 v2.0.0-20220930150014-52b12276cc4a h1:jwFoLdIzNYc92s2ZwhU4yOdoPP8zoALcKOzenIALHJM=
106-
github.com/cloudevents/sdk-go/sql/v2 v2.0.0-20220930150014-52b12276cc4a/go.mod h1:SPV4fdKh1YqSNn2TTUVqUcw1El9Er0HI/yzay5wqsFk=
107-
github.com/cloudevents/sdk-go/v2 v2.12.0 h1:p1k+ysVOZtNiXfijnwB3WqZNA3y2cGOiKQygWkUHCEI=
108-
github.com/cloudevents/sdk-go/v2 v2.12.0/go.mod h1:xDmKfzNjM8gBvjaF8ijFjM1VYOVUEeUfapHMUX1T5To=
103+
github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.13.0 h1:Mf5y5GYVusfOpPQsKHOvr9c3Y76fZnSZzuZo+LQr/aU=
104+
github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.13.0/go.mod h1:vgBrMXc1h8htR8PUlGViBcNEkri4fw98nY8Tqsgdtfs=
105+
github.com/cloudevents/sdk-go/sql/v2 v2.13.0 h1:gMJvQ3XFkygY9JmrusgK80d9yRAb8+J3X8IA1OC+oc0=
106+
github.com/cloudevents/sdk-go/sql/v2 v2.13.0/go.mod h1:XZRQBCgRreddIpQrdjBJQUrRg3BCs3aikplJQkHrK44=
107+
github.com/cloudevents/sdk-go/v2 v2.13.0 h1:2zxDS8RyY1/wVPULGGbdgniGXSzLaRJVl136fLXGsYw=
108+
github.com/cloudevents/sdk-go/v2 v2.13.0/go.mod h1:xDmKfzNjM8gBvjaF8ijFjM1VYOVUEeUfapHMUX1T5To=
109109
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
110110
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
111111
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -970,16 +970,16 @@ k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkI
970970
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
971971
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8=
972972
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
973-
knative.dev/eventing v0.35.1-0.20221222110658-271c9bb53a52 h1:fwPsgk5YuC36yy9KsyWjYrApSesm9fUK5GnA9QkxYsk=
974-
knative.dev/eventing v0.35.1-0.20221222110658-271c9bb53a52/go.mod h1:Z7U8AjFpxwCVubg5ri1evHAGenl090PHtezRJpjxMko=
975-
knative.dev/hack v0.0.0-20221209013717-b9801b4f5a4d h1:nMp1GE3iwrJzABi4xP0xSVOwaaZMJ8loT9S42d54wFM=
976-
knative.dev/hack v0.0.0-20221209013717-b9801b4f5a4d/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
977-
knative.dev/networking v0.0.0-20221202133217-891aac251fc2 h1:yH0zKV0jwP/+jx7UcMHqjx5jbr4NZAjh9I1CkKvbCfo=
978-
knative.dev/networking v0.0.0-20221202133217-891aac251fc2/go.mod h1:E1E3jgjSFt5mxGHeoqkCDgBI/PLmo4wUwZu5j1DHMes=
979-
knative.dev/pkg v0.0.0-20221221230956-4fd6eb8652b7 h1:YaO4KgF1Kp8BTi1hxMXDRnvsxCFq/wpotOD3jzrHmzw=
980-
knative.dev/pkg v0.0.0-20221221230956-4fd6eb8652b7/go.mod h1:IeUSNPPUpQnM35SjpnfCx0w5/V2RpEc+nmke6oPwpD0=
981-
knative.dev/serving v0.35.1-0.20221220012254-3b8f17cd6f97 h1:/sZkq+1EizdcAfnlksXbmWTj/+jDTXVVoKes0km1VzM=
982-
knative.dev/serving v0.35.1-0.20221220012254-3b8f17cd6f97/go.mod h1:20yL5kdWXsxJ6yYKvTtcfnnx7GClAiBSTHz7roI1d6s=
973+
knative.dev/eventing v0.36.0 h1:a7kamc2S+LcpNMDX3llnwZm+DqMcYSXgKIgJXdaQQSY=
974+
knative.dev/eventing v0.36.0/go.mod h1:Qka5Z6+LeMoHGL1QAznVdmq5LAu21b4F3rgxc2AMgRg=
975+
knative.dev/hack v0.0.0-20230113013652-c7cfcb062de9 h1:CDa7s9KspEZqPhk7cN68ZypRLuAvSgr+knoOaXSsrHk=
976+
knative.dev/hack v0.0.0-20230113013652-c7cfcb062de9/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
977+
knative.dev/networking v0.0.0-20230123233838-db2bcbea2560 h1:iprdS5tKTXtgV9dGryuwJJJTTdl5LusCHOelKdezR3I=
978+
knative.dev/networking v0.0.0-20230123233838-db2bcbea2560/go.mod h1:rn1yRurhkxmSFkpqs/YdG7b9DiYj0VlmLFzBdOQjpOo=
979+
knative.dev/pkg v0.0.0-20230117181655-247510c00e9d h1:pjKDcvHoMib8nRp56eISRmMj/pFMzJljnzvMvGCIReI=
980+
knative.dev/pkg v0.0.0-20230117181655-247510c00e9d/go.mod h1:VO/fcEsq43seuONRQxZyftWHjpMabYzRHDtpSEQ/eoQ=
981+
knative.dev/serving v0.36.0 h1:RSYDjxhzOx5rnlW9tNPcBPyJyNuOcZuYEMdKDR1r04k=
982+
knative.dev/serving v0.36.0/go.mod h1:ueqMvTqzZE0GFfPqSsc+ZjX20Z8XxCuX86+S+TI7B3A=
983983
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
984984
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
985985
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

vendor/github.com/cloudevents/sdk-go/sql/v2/parser/expression_visitor.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudevents/sdk-go/sql/v2/utils/casting.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudevents/sdk-go/v2/alias.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudevents/sdk-go/v2/protocol/http/abuse_protection.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudevents/sdk-go/v2/protocol/http/protocol_lifecycle.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/knative.dev/eventing/pkg/apis/sources/v1/apiserver_types.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ type ApiServerSourceSpec struct {
8080
// source. Defaults to default if not set.
8181
// +optional
8282
ServiceAccountName string `json:"serviceAccountName,omitempty"`
83+
84+
// NamespaceSelector is a label selector to capture the namespaces that
85+
// should be watched by the source.
86+
// +optional
87+
NamespaceSelector *metav1.LabelSelector `json:"namespaceSelector,omitempty"`
8388
}
8489

8590
// ApiServerSourceStatus defines the observed state of ApiServerSource
@@ -92,6 +97,9 @@ type ApiServerSourceStatus struct {
9297
// * SinkURI - the current active sink URI that has been configured for the
9398
// Source.
9499
duckv1.SourceStatus `json:",inline"`
100+
101+
// Namespaces show the namespaces currently watched by the ApiServerSource
102+
Namespaces []string `json:"namespaces"`
95103
}
96104

97105
// APIVersionKind is an APIVersion and Kind tuple.

vendor/knative.dev/eventing/pkg/apis/sources/v1/zz_generated.deepcopy.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/knative.dev/eventing/test/lib/logexporter.go

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,21 @@ limitations under the License.
1717
package lib
1818

1919
import (
20+
"bytes"
2021
"context"
2122
"fmt"
2223
"log"
2324
"os"
2425
"path/filepath"
26+
"strings"
27+
"sync"
28+
"testing"
2529

2630
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2731
"k8s.io/client-go/kubernetes"
2832
pkgtest "knative.dev/pkg/test"
2933
"knative.dev/pkg/test/helpers"
34+
"knative.dev/pkg/test/logstream/v2"
3035
"knative.dev/pkg/test/prow"
3136
)
3237

@@ -95,3 +100,92 @@ func ExportLogs(systemLogsDir, systemNamespace string) {
95100
}
96101
}
97102
}
103+
104+
// ExportLogStreamOnError starts a log stream from the given namespace
105+
// for pods specified via podPrefixes. The log strema is stopped and
106+
// logs exported upon calling the returned Canceler.
107+
func ExportLogStreamOnError(t *testing.T, logDir, namespace string, podPrefixes ...string) logstream.Canceler {
108+
config, err := pkgtest.Flags.GetRESTConfig()
109+
if err != nil {
110+
t.Fatalf("Failed to create REST config: %v\n", err)
111+
}
112+
113+
kubeClient, err := kubernetes.NewForConfig(config)
114+
if err != nil {
115+
t.Fatalf("Failed to create kube client: %v\n", err)
116+
}
117+
118+
buf := threadSafeBuffer{}
119+
callback := func(s string, params ...interface{}) {
120+
buf.Write([]byte(fmt.Sprintf(s, params...) + "\n"))
121+
}
122+
123+
sysStream := logstream.New(context.Background(), kubeClient,
124+
logstream.WithNamespaces(namespace),
125+
logstream.WithLineFiltering(false),
126+
logstream.WithPodPrefixes(podPrefixes...))
127+
canceler, err := sysStream.StartStream("unfiltered-logs", callback)
128+
if err != nil {
129+
t.Fatal("Unable to stream logs from namespace", err)
130+
}
131+
132+
return func() {
133+
canceler()
134+
135+
if !t.Failed() {
136+
return
137+
}
138+
139+
// Maps pod name prefix to its logs.
140+
logs := make(map[string]string)
141+
if len(podPrefixes) == 0 {
142+
logs["all-in-one"] = buf.String()
143+
} else {
144+
// Divide logs by podPrefix so that logs for each pod are stored in a separate file.
145+
for _, podPrefix := range podPrefixes {
146+
for _, line := range strings.Split(buf.String(), "\n") {
147+
if strings.Contains(line, podPrefix) {
148+
logs[podPrefix] = logs[podPrefix] + line + "\n"
149+
}
150+
}
151+
}
152+
}
153+
154+
dir := filepath.Join(prow.GetLocalArtifactsDir(), logDir)
155+
if err := helpers.CreateDir(dir); err != nil {
156+
t.Errorf("Error creating directory %q: %v", dir, err)
157+
}
158+
159+
var errs []error
160+
for podPrefix, log := range logs {
161+
path := filepath.Join(dir, fmt.Sprintf("%s.log", podPrefix))
162+
f, err := os.Create(path)
163+
if err != nil {
164+
errs = append(errs, fmt.Errorf("error creating file %q: %w", path, err))
165+
continue
166+
}
167+
_, err = f.Write([]byte(log))
168+
if err != nil {
169+
errs = append(errs, fmt.Errorf("error writing logs into file %q: %w", path, err))
170+
}
171+
_ = f.Close()
172+
}
173+
174+
if len(errs) > 0 {
175+
t.Errorf("Failed to write logs: %v", helpers.CombineErrors(errs))
176+
}
177+
}
178+
}
179+
180+
// threadSafeBuffer avoids race conditions on bytes.Buffer.
181+
// See: https://stackoverflow.com/a/36226525/844449
182+
type threadSafeBuffer struct {
183+
bytes.Buffer
184+
sync.Mutex
185+
}
186+
187+
func (b *threadSafeBuffer) Write(p []byte) (n int, err error) {
188+
b.Mutex.Lock()
189+
defer b.Mutex.Unlock()
190+
return b.Buffer.Write(p)
191+
}

0 commit comments

Comments
 (0)