Skip to content

Commit

Permalink
bump golang to 1.17 (#25)
Browse files Browse the repository at this point in the history
* bump golang to 1.17

* fix: go mod tidy

* feat:bump up passenger for e2e testing

* feat:bump passenger to 6.0.10

* ci:bump setup-kind up
  • Loading branch information
h-r-k-matsumoto authored Sep 30, 2021
1 parent 002caab commit 2c75e9e
Show file tree
Hide file tree
Showing 10 changed files with 150 additions and 156 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: "3"
services:
# Update this to the name of the service you want to work with in your docker-compose.yml file
go:
image: golang:1.16
image: golang:1.17
# If you want add a non-root user to your Dockerfile, you can use the "remoteUser"
# property in devcontainer.json to cause VS Code its sub-processes (terminals, tasks,
# debugging) to execute as the user. Uncomment the next line if you want the entire
Expand Down Expand Up @@ -43,7 +43,7 @@ services:
depends_on:
- passenger-app
passenger-app:
image: ghcr.io/rakutentech/passenger-go-exporter/passenger-app:6.0.5
image: ghcr.io/rakutentech/passenger-go-exporter/passenger-app:6.0.10
ports:
- 3000:3000
environment:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ jobs:
strategy:
matrix:
passenger-version:
- 6.0.5
- 6.0.6
- 6.0.7
- 6.0.8
- 6.0.9
- 6.0.10
steps:
- uses: actions/checkout@v2
- uses: engineerd/[email protected]
with:
version: v0.11.1
- name: Kind Load Image
run: |
docker build -t passenger-go-exporter:test .
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16'
go-version: '1.17'
- uses: actions/cache@v2
with:
path: ~/go/pkg/mod
Expand All @@ -35,14 +35,14 @@ jobs:
name: Lint
strategy:
matrix:
go-version: [1.16]
go-version: [1.17]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
stable: 'true'
go-version: '1.16'
go-version: '1.17'
- uses: golangci/golangci-lint-action@v2
with:
skip-go-installation: true
2 changes: 1 addition & 1 deletion .github/workflows/releease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.17

- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16 AS builder
FROM golang:1.17 AS builder
WORKDIR /go/src/github.com/rakutentech/passenger-go-exporter

COPY go.mod go.sum ./
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Implemented in golang, keeps memory consumption below 100MB, and runs on CPU 0.0

## Supported version

- golang: 1.16
- Passenger: 6.0.4, or later.
- golang: 1.17
- Passenger: 6.0.8, or later.

All other versions have not been tested.

Expand Down
23 changes: 19 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
module github.com/rakutentech/passenger-go-exporter

go 1.16
go 1.17

require (
github.com/go-kit/kit v0.10.0
github.com/go-kit/kit v0.11.0
github.com/golang/protobuf v1.5.2 // indirect
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/common v0.29.0
github.com/stretchr/testify v1.6.1
github.com/stretchr/testify v1.7.0
golang.org/x/net v0.0.0-20210614182718-04defd469f4e
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-kit/log v0.1.0 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
golang.org/x/text v0.3.6 // indirect
google.golang.org/protobuf v1.27.1 // indirect
)
251 changes: 114 additions & 137 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/kubernetes/example/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ bases:
images:
- name: example
newName: ghcr.io/rakutentech/passenger-go-exporter/passenger-app
newTag: 6.0.5
newTag: 6.0.10
- name: passenger-exporter
newName: ghcr.io/rakutentech/passenger-go-exporter
newTag: v1.1.0
newTag: v1.2.0
2 changes: 1 addition & 1 deletion test/kubernetes/test/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ patchesJson6902:
images:
- name: example
newName: ghcr.io/rakutentech/passenger-go-exporter/passenger-app
newTag: 6.0.5
newTag: 6.0.10
- name: passenger-exporter
newName: passenger-go-exporter
newTag: test

0 comments on commit 2c75e9e

Please sign in to comment.