Skip to content

Commit 502610b

Browse files
hanahmilyhanahmily
authored
Bump go and dependencies (#89)
* Bump go and dependencies --------- Signed-off-by: Gao Hongtao <hanahmily@gmail.com>
1 parent a362d2b commit 502610b

31 files changed

Lines changed: 63 additions & 63 deletions

‎.github/workflows/go.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install Go
3535
uses: actions/setup-go@v3
3636
with:
37-
go-version: 1.19
37+
go-version: '1.20'
3838
id: go
3939
- name: Check out code into the Go module directory
4040
uses: actions/checkout@v3
@@ -49,7 +49,7 @@ jobs:
4949
- name: Install Go
5050
uses: actions/setup-go@v3
5151
with:
52-
go-version: 1.19
52+
go-version: '1.20'
5353
- name: Check out code into the Go module directory
5454
uses: actions/checkout@v3
5555
- name: Build
@@ -63,7 +63,7 @@ jobs:
6363
- name: Install Go
6464
uses: actions/setup-go@v3
6565
with:
66-
go-version: 1.19
66+
go-version: '1.20'
6767
id: go
6868
- name: Check out code into the Go module directory
6969
uses: actions/checkout@v3
@@ -78,7 +78,7 @@ jobs:
7878
- name: Install Go
7979
uses: actions/setup-go@v3
8080
with:
81-
go-version: 1.19
81+
go-version: '1.20'
8282
id: go
8383
- name: Check out code into the Go module directory
8484
uses: actions/checkout@v3
@@ -93,7 +93,7 @@ jobs:
9393
- name: Install Go
9494
uses: actions/setup-go@v3
9595
with:
96-
go-version: 1.19
96+
go-version: '1.20'
9797
id: go
9898
- name: Check out code into the Go module directory
9999
uses: actions/checkout@v3
@@ -108,7 +108,7 @@ jobs:
108108
- name: Install Go
109109
uses: actions/setup-go@v3
110110
with:
111-
go-version: 1.19
111+
go-version: '1.20'
112112
id: go
113113
- name: Check out code into the Go module directory
114114
uses: actions/checkout@v3
@@ -123,7 +123,7 @@ jobs:
123123
- name: Install Go
124124
uses: actions/setup-go@v3
125125
with:
126-
go-version: 1.19
126+
go-version: '1.20'
127127
id: go
128128
- name: Check out code into the Go module directory
129129
uses: actions/checkout@v3
@@ -144,7 +144,7 @@ jobs:
144144
- name: Install Go
145145
uses: actions/setup-go@v3
146146
with:
147-
go-version: 1.19
147+
go-version: '1.20'
148148
id: go
149149
- name: Check out code into the Go module directory
150150
uses: actions/checkout@v3
@@ -159,7 +159,7 @@ jobs:
159159
- name: Install Go
160160
uses: actions/setup-go@v3
161161
with:
162-
go-version: 1.19
162+
go-version: '1.20'
163163
id: go
164164
- name: Check out code into the Go module directory
165165
uses: actions/checkout@v3
@@ -174,7 +174,7 @@ jobs:
174174
- name: Install Go
175175
uses: actions/setup-go@v3
176176
with:
177-
go-version: 1.19
177+
go-version: '1.20'
178178
id: go
179179
- name: Check out code into the Go module directory
180180
uses: actions/checkout@v3
@@ -189,7 +189,7 @@ jobs:
189189
- name: Install Go
190190
uses: actions/setup-go@v3
191191
with:
192-
go-version: 1.19
192+
go-version: '1.20'
193193
id: go
194194
- name: Check out code into the Go module directory
195195
uses: actions/checkout@v3
@@ -204,7 +204,7 @@ jobs:
204204
- name: Install Go
205205
uses: actions/setup-go@v3
206206
with:
207-
go-version: 1.19
207+
go-version: '1.20'
208208
id: go
209209
- name: Check out code into the Go module directory
210210
uses: actions/checkout@v3
@@ -219,7 +219,7 @@ jobs:
219219
- name: Install Go
220220
uses: actions/setup-go@v3
221221
with:
222-
go-version: 1.19
222+
go-version: '1.20'
223223
id: go
224224
- name: Check out code into the Go module directory
225225
uses: actions/checkout@v3

‎CHANGES.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Release Notes.
1212
- Fix errors in banyandb e2e test.
1313

1414
#### Chores
15-
- Bump up golang to v1.19.
16-
- Bump up golangci-lint to v1.50.0.
15+
- Bump up golang to v1.20.
16+
- Bump up golangci-lint to v1.53.3.
1717
- Bump up skywalking-java-agent to v8.16.0.
1818
- Bump up kustomize to v4.5.6.
1919
- Bump up SkyWalking OAP to 9.5.0.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ For more details, please read [Java agent injector](/docs/java-agent-injector.md
5656
or
5757

5858
```
59-
kubectl apply -k "github.com/apache/skywalking-swck/operator/config/default?ref=v0.7.0"
59+
kubectl apply -k "github.com/apache/skywalking-swck/operator/config/default?ref=v0.8.0"
6060
```
6161

6262
For more details, please refer to [deploy operator](docs/operator.md)
@@ -78,7 +78,7 @@ For more details, please refer to [deploy operator](docs/operator.md)
7878
or
7979

8080
```
81-
kubectl apply -k "github.com/apache/skywalking-swck/adapter/config?ref=v0.7.0"
81+
kubectl apply -k "github.com/apache/skywalking-swck/adapter/config?ref=v0.8.0"
8282
```
8383

8484
For more details, please read [Custom metrics adapter](docs/custom-metrics-adapter.md)

‎adapter/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515

1616
# Build the manager binary
17-
FROM golang:1.19 as builder
17+
FROM golang:1.20 as builder
1818

1919
WORKDIR /workspace
2020
# Copy the Go Modules manifests

‎adapter/config/namespaced/adapter/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ kind: Kustomization
2222
images:
2323
- name: metrics-adapter
2424
newName: apache/skywalking-swck
25-
newTag: v0.7.0
25+
newTag: v0.8.0

‎adapter/dist/LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ BSD-3-Clause licenses
9595
golang.org/x/net v0.7.0 BSD-3-Clause
9696
golang.org/x/oauth2 v0.4.0 BSD-3-Clause
9797
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 BSD-3-Clause
98-
golang.org/x/sys v0.5.0 BSD-3-Clause
98+
golang.org/x/sys v0.10.0 BSD-3-Clause
9999
golang.org/x/term v0.5.0 BSD-3-Clause
100100
golang.org/x/text v0.7.0 BSD-3-Clause
101101
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 BSD-3-Clause
@@ -122,7 +122,7 @@ MIT licenses
122122
github.com/josharian/intern v1.0.0 MIT
123123
github.com/json-iterator/go v1.1.12 MIT
124124
github.com/mailru/easyjson v0.7.6 MIT
125-
github.com/sirupsen/logrus v1.8.1 MIT
125+
github.com/sirupsen/logrus v1.9.3 MIT
126126
github.com/urfave/cli v1.22.1 MIT
127127
go.uber.org/atomic v1.7.0 MIT
128128
go.uber.org/multierr v1.6.0 MIT

‎adapter/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-swck/adapter
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/apache/skywalking-cli v0.0.0-20210209032327-04a0ce08990f
@@ -58,7 +58,7 @@ require (
5858
github.com/prometheus/common v0.32.1 // indirect
5959
github.com/prometheus/procfs v0.7.3 // indirect
6060
github.com/russross/blackfriday/v2 v2.1.0 // indirect
61-
github.com/sirupsen/logrus v1.8.1 // indirect
61+
github.com/sirupsen/logrus v1.9.3 // indirect
6262
github.com/spf13/cobra v1.4.0 // indirect
6363
github.com/spf13/pflag v1.0.5 // indirect
6464
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
@@ -82,7 +82,7 @@ require (
8282
golang.org/x/net v0.7.0 // indirect
8383
golang.org/x/oauth2 v0.4.0 // indirect
8484
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
85-
golang.org/x/sys v0.5.0 // indirect
85+
golang.org/x/sys v0.10.0 // indirect
8686
golang.org/x/term v0.5.0 // indirect
8787
golang.org/x/text v0.7.0 // indirect
8888
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect

‎adapter/go.sum‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,9 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
580580
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
581581
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
582582
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
583-
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
584583
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
584+
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
585+
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
585586
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
586587
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
587588
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -927,8 +928,9 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc
927928
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
928929
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
929930
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
930-
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
931-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
931+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
932+
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
933+
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
932934
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
933935
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
934936
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=

‎adapter/pkg/provider/provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func bufferEntity(buff []string, index int, requirement labels.Requirement, dec
161161
return buff, nil
162162
}
163163

164-
func (p *externalMetricsProvider) GetExternalMetric(ctx context.Context, namespace string, metricSelector labels.Selector,
164+
func (p *externalMetricsProvider) GetExternalMetric(_ context.Context, namespace string, metricSelector labels.Selector,
165165
info apiprovider.ExternalMetricInfo) (*external_metrics.ExternalMetricValueList, error) {
166166
var md *swctlapi.MetricDefinition
167167
for _, m := range p.metricDefines {

‎build/images/Dockerfile.release-bin‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# limitations under the License.
1515

1616
FROM gcr.io/distroless/static:nonroot
17+
WORKDIR /
1718
COPY --chown=65532:65532 bin/manager-linux-amd64 /manager
1819
COPY --chown=65532:65532 bin/adapter-linux-amd64 /adapter
1920
USER 65532:65532

0 commit comments

Comments
 (0)