Skip to content

Commit

Permalink
Merge pull request #49 from rksharma95/main
Browse files Browse the repository at this point in the history
upgrade go version to 1.21
  • Loading branch information
daemon1024 authored Mar 14, 2024
2 parents f0c1cc2 + 73a3ad7 commit b05c184
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 1,925 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
- name: Checkout Source
uses: actions/checkout@v2

- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: v1.20.x
go-version-file: './relay-server/go.mod'

- name: Check gofmt
run: gofmt -s -d $(find . -type f -name '*.go' -print)
Expand All @@ -38,9 +38,9 @@ jobs:
- name: Checkout Source
uses: actions/checkout@v2

- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: v1.20.x
go-version-file: './relay-server/go.mod'

- name: Run Gosec Security Scanner
run: |
Expand Down
2 changes: 1 addition & 1 deletion relay-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### Builder

FROM golang:1.20-alpine3.17 as builder
FROM golang:1.22-alpine3.19 as builder

RUN apk update
RUN apk add --no-cache make
Expand Down
35 changes: 34 additions & 1 deletion relay-server/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kubearmor/kubearmor-relay-server/relay-server

go 1.15
go 1.22

replace (
github.com/kubearmor/kubearmor-relay-server/relay-server => ./
Expand All @@ -20,3 +20,36 @@ require (
k8s.io/apimachinery v0.21.1
k8s.io/client-go v0.21.1
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.4.1 // indirect
github.com/imdario/mergo v0.3.5 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/oauth2 v0.14.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.21.1 // indirect
k8s.io/klog/v2 v2.8.0 // indirect
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
Loading

0 comments on commit b05c184

Please sign in to comment.