Skip to content

Commit 097bdff

Browse files
authored
Merge pull request #443 from devhindo/master
Updating Meshery Adapter for Kuma to Go version to 1.23
2 parents 87cc418 + 5eaeb45 commit 097bdff

9 files changed

Lines changed: 64 additions & 25 deletions

File tree

.github/workflows/build-and-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
with:
2020
fetch-depth: 1
2121
- name: Setup Go
22-
uses: actions/setup-go@v3
22+
uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.19
24+
go-version: 1.23
2525
- run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build .
2626
docker:
2727
name: Docker build and push

.github/workflows/ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
name: golangci-lint
1818
runs-on: ubuntu-22.04
1919
steps:
20-
- uses: actions/setup-go@v3
20+
- uses: actions/setup-go@v5
2121
with:
22-
go-version: 1.19
22+
go-version: 1.23
2323
- uses: actions/checkout@v3
2424
- name: golangci-lint
25-
uses: golangci/golangci-lint-action@v3
25+
uses: golangci/golangci-lint-action@v6
2626
with:
2727
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
28-
version: v1.49
28+
version: v1.62
2929

3030
# Optional: working directory, useful for monorepos
3131
# working-directory: somedir
@@ -44,9 +44,9 @@ jobs:
4444
with:
4545
fetch-depth: 1
4646
- name: Setup Go
47-
uses: actions/setup-go@v3
47+
uses: actions/setup-go@v5
4848
with:
49-
go-version: 1.19
49+
go-version: 1.23
5050
- run: GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/kisielk/errcheck@latest; /home/runner/go/bin/errcheck -tags draft ./...
5151
error_code_check:
5252
name: Error code utility check
@@ -59,7 +59,7 @@ jobs:
5959
- name: Setup Go
6060
uses: actions/setup-go@v3
6161
with:
62-
go-version: 1.19
62+
go-version: 1.23
6363
- run: |
6464
errWillHave="level=error"
6565
GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/layer5io/meshkit/cmd/errorutil;
@@ -79,13 +79,13 @@ jobs:
7979
with:
8080
fetch-depth: 1
8181
- name: Setup Go
82-
uses: actions/setup-go@v3
82+
uses: actions/setup-go@v5
8383
with:
84-
go-version: 1.19
85-
- uses: dominikh/staticcheck-action@v1.2.0
84+
go-version: 1.23
85+
- uses: dominikh/staticcheck-action@v1
8686
with:
8787
install-go: false
88-
version: "2022.1"
88+
version: "2024.1"
8989
vet:
9090
name: Vet
9191
runs-on: ubuntu-22.04
@@ -95,9 +95,9 @@ jobs:
9595
with:
9696
fetch-depth: 1
9797
- name: Setup Go
98-
uses: actions/setup-go@v3
98+
uses: actions/setup-go@v5
9999
with:
100-
go-version: 1.19
100+
go-version: 1.23
101101
- run: GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go vet -tags draft ./...
102102
sec_check:
103103
name: Security check
@@ -125,9 +125,9 @@ jobs:
125125
with:
126126
fetch-depth: 1
127127
- name: Setup Go
128-
uses: actions/setup-go@v3
128+
uses: actions/setup-go@v5
129129
with:
130-
go-version: 1.19
130+
go-version: 1.23
131131
- name: Create cluster using KinD
132132
uses: engineerd/setup-kind@v0.5.0
133133
with:

.github/workflows/e2etest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
yq e -i '.services.kuma.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploy.yaml
4242
cat ./.github/install/deploy.yaml
4343
- name: Uploading file
44-
uses: actions/upload-artifact@v2
44+
uses: actions/upload-artifact@v4
4545
with:
4646
name: patternfile
4747
path: ./.github/install/deploy.yaml

.github/workflows/error-ref-publisher.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
ref: 'master'
2020

2121
- name: Setup Go
22-
uses: actions/setup-go@v3
22+
uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.19
24+
go-version: 1.23
2525

2626
- name: Run utility
2727
run: |

.github/workflows/update-oam-defs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
token: ${{ secrets.GH_ACCESS_TOKEN }}
2020
ref: "master"
2121
- name: Setup Go
22-
uses: actions/setup-go@v3
22+
uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.19
24+
go-version: 1.23
2525
- name: Run adapter to create components
2626
run: |
2727
touch log.txt

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19 as builder
1+
FROM golang:1.23 as builder
22

33
ARG VERSION
44
ARG GIT_COMMITSHA

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/layer5io/meshery-kuma
22

3-
go 1.19
3+
go 1.23
44

55
replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334
66

go.sum

Lines changed: 39 additions & 0 deletions
Large diffs are not rendered by default.

kuma/oam.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func mergeErrors(errs []error) error {
202202
errMsgs = append(errMsgs, err.Error())
203203
}
204204

205-
return fmt.Errorf(strings.Join(errMsgs, "\n"))
205+
return fmt.Errorf("%s", strings.Join(errMsgs, "\n"))
206206
}
207207

208208
func mergeMsgs(strs []string) string {

0 commit comments

Comments
 (0)