Skip to content

Commit 1460868

Browse files
hwjiangkaihwjiangkai
committed
Merge branch 'main' into clientstream-v2
Signed-off-by: jyjiangkai <[email protected]>
2 parents 86a6f0e + 6b23e5a commit 1460868

File tree

211 files changed

+8608
-4391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+8608
-4391
lines changed

‎.github/workflows/codecov.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
startsWith(github.event.pull_request.title, 'fix') ||
2222
startsWith(github.event.pull_request.title, 'feat') ||
2323
startsWith(github.event.pull_request.title, 'refactor') ||
24-
startsWith(github.event.pull_request.title, 'perf')
24+
startsWith(github.event.pull_request.title, 'perf') ||
25+
startsWith(github.event.pull_request.title, 'test')
2526
runs-on: ${{ matrix.os }}
2627
env:
2728
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎CONTRIBUTING.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ resources to make it easier to get your contribution accepted.
2929
## Before you get started
3030

3131
### Sign the CLA
32-
Click [here](https://cla-assistant.io/linkall-labs/) to sign the CLA, and click the `Sign in with GitHub to agree` button to sign.
32+
Click [here](https://cla-assistant.io/linkall-labs/vanus) to sign the CLA, and click the `Sign in with GitHub to agree` button to sign.
3333

3434
What is [CLA](https://en.wikipedia.org/wiki/Contributor_License_Agreement).
3535

@@ -51,7 +51,7 @@ assigned to someone.
5151

5252
#### First Contribution
5353
You can start by finding existing issues with the
54-
[good-first-issue](https://github.com/linkall-labs/vanus/issues?q=is%3Aopen+is%3Aissue+label%3Agood-first-issue) label.
54+
[good-first-issue](https://github.com/linkall-labs/vanus/issues?q=is%3Aopen+is%3Aissue+label%3A"good+first+issue") label.
5555
These issues are well suited for a new contributor.
5656

5757
#### Further Contributions
@@ -113,6 +113,3 @@ There are some automated tasks to ensure each PR's reach high quality in Vanus.
113113
### Code Review
114114
The Code Review can be started until all checking were passed. Each PR will automatically assign reviewers. After getting
115115
at least one `Approve` from reviewers, the PR can be merged.
116-
117-
## Reward
118-
Once your PR has been merged, you become a Vanus Contributor. Thanks for your contribution! please fill the [form](#) to get you reward

‎build/images/controller/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG TARGETOS
88
ARG TARGETARCH
99
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make build-controller
1010

11-
FROM alpine:3.15.4
11+
FROM ubuntu:22.10
1212
WORKDIR /vanus
1313
COPY --from=builder /workspace/bin/controller bin/controller
1414
ENTRYPOINT ["bin/controller"]

‎build/images/gateway/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG TARGETOS
88
ARG TARGETARCH
99
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make build-gateway
1010

11-
FROM alpine:3.15.4
11+
FROM ubuntu:22.10
1212
WORKDIR /vanus
1313
COPY --from=builder /workspace/bin/gateway bin/gateway
1414
ENTRYPOINT ["bin/gateway"]

‎build/images/store/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG TARGETOS
88
ARG TARGETARCH
99
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make build-store
1010

11-
FROM alpine:3.15.4
11+
FROM ubuntu:22.10
1212
WORKDIR /vanus
1313
COPY --from=builder /workspace/bin/store bin/store
1414
ENTRYPOINT ["bin/store"]

‎build/images/timer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG TARGETOS
88
ARG TARGETARCH
99
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make build-timer
1010

11-
FROM alpine:3.15.4
11+
FROM ubuntu:22.10
1212
WORKDIR /vanus
1313
COPY --from=builder /workspace/bin/timer bin/timer
1414
ENTRYPOINT ["bin/timer"]

‎build/images/trigger/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG TARGETOS
88
ARG TARGETARCH
99
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make build-trigger
1010

11-
FROM alpine:3.15.4
11+
FROM ubuntu:22.10
1212
WORKDIR /vanus
1313
COPY --from=builder /workspace/bin/trigger bin/trigger
1414
ENTRYPOINT ["bin/trigger"]

‎client/go.mod

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@ module github.com/linkall-labs/vanus/client
33
go 1.18
44

55
require (
6-
github.com/cloudevents/sdk-go/v2 v2.11.0
6+
github.com/cloudevents/sdk-go/v2 v2.12.0
77
github.com/golang/mock v1.6.0
8-
github.com/linkall-labs/vanus/observability v0.5.1
9-
github.com/linkall-labs/vanus/pkg v0.5.1
10-
github.com/linkall-labs/vanus/proto v0.5.1
8+
github.com/linkall-labs/vanus/observability v0.5.6
9+
github.com/linkall-labs/vanus/pkg v0.5.6
10+
github.com/linkall-labs/vanus/proto v0.5.6
1111
github.com/scylladb/go-set v1.0.2
1212
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4
13-
go.opentelemetry.io/otel/trace v1.11.1
13+
go.opentelemetry.io/otel/trace v1.11.2
1414
go.uber.org/atomic v1.9.0
15-
google.golang.org/grpc v1.50.1
15+
google.golang.org/grpc v1.51.0
1616
google.golang.org/protobuf v1.28.1
1717
)
1818

1919
require (
20-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
20+
cloud.google.com/go/compute/metadata v0.2.1 // indirect
21+
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
2122
github.com/go-logr/logr v1.2.3 // indirect
2223
github.com/go-logr/stdr v1.2.2 // indirect
2324
github.com/golang/protobuf v1.5.2 // indirect
@@ -28,25 +29,24 @@ require (
2829
github.com/modern-go/reflect2 v1.0.2 // indirect
2930
github.com/pkg/errors v0.9.1 // indirect
3031
github.com/sirupsen/logrus v1.9.0 // indirect
31-
go.opentelemetry.io/otel v1.11.1 // indirect
32-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.9.0 // indirect
33-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.9.0 // indirect
34-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.9.0 // indirect
35-
go.opentelemetry.io/otel/sdk v1.9.0 // indirect
36-
go.opentelemetry.io/proto/otlp v0.18.0 // indirect
32+
go.opentelemetry.io/otel v1.11.2 // indirect
33+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 // indirect
34+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.2 // indirect
35+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.2 // indirect
36+
go.opentelemetry.io/otel/sdk v1.11.2 // indirect
37+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
3738
go.uber.org/multierr v1.7.0 // indirect
3839
go.uber.org/zap v1.17.0 // indirect
39-
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
40-
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
41-
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
42-
golang.org/x/text v0.3.7 // indirect
40+
golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
41+
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
42+
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
43+
golang.org/x/text v0.4.0 // indirect
4344
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
44-
google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f // indirect
45+
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c // indirect
4546
gopkg.in/yaml.v2 v2.4.0 // indirect
4647
)
4748

4849
replace (
49-
cloud.google.com/go => cloud.google.com/go v0.100.2
5050
github.com/linkall-labs/vanus/observability => ../observability
5151
github.com/linkall-labs/vanus/pkg => ../pkg
5252
github.com/linkall-labs/vanus/proto => ../proto

0 commit comments

Comments
 (0)