Skip to content

Commit

Permalink
upgrade go to 1.21 (pomerium#799)
Browse files Browse the repository at this point in the history
  • Loading branch information
calebdoxsey authored Nov 6, 2023
1 parent 0486705 commit 2a19655
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: 1.20.x
go-version: 1.21.x

- name: generate docs
run: make docs
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: 1.20.x
go-version: 1.21.x
- uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
with:
python-version: "3.x"
Expand All @@ -34,16 +34,13 @@ jobs:
SKIP: go-mod-tidy,lint

test:
strategy:
matrix:
go-version: [1.20.x]
runs-on:
group: large-runners
labels: linux
steps:
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{ matrix.go-version }}
go-version: 1.21.x
- name: set env vars
run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
Expand Down Expand Up @@ -73,16 +70,13 @@ jobs:
run: make test

build:
strategy:
matrix:
go-version: [1.20.x]
runs-on:
group: large-runners
labels: linux
steps:
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with:
go-version: ${{ matrix.go-version }}
go-version: 1.21.x
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
with:
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
golang 1.20.3
golang 1.21.3
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Build the manager binary
# make sure to run `make clean` if building locally

FROM golang:1.21.3@sha256:825766243db91e041ce9f9589f321e9e50704cc36c7b9ccdeb0be3c5a81d647c as go-modules
FROM golang:1.21.3-bookworm@sha256:d0214956a9c50c300e430c1f6c0a820007ace238e5242c53762e61b344659e05 as go-modules

WORKDIR /workspace

Expand All @@ -20,7 +20,7 @@ COPY Makefile ./Makefile
RUN mkdir -p internal
RUN make internal/ui

FROM node:lts-buster@sha256:2daec43046b715994ce9c816b9c91478a0d5fb79029b59e45da277e2935cf558 as ui
FROM node:lts-bookworm@sha256:42a4d97d4abf2f278c323370cf9c8dbccc2a238acceebceb53711926ecfb4110 as ui
WORKDIR /workspace

COPY --from=go-modules /workspace/internal/ui ./
Expand All @@ -40,7 +40,7 @@ RUN CGO_ENABLED=0 make build-go

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM gcr.io/distroless/base:debug-nonroot@sha256:6691be59b27dde70a2cec7b9794096b8bbf63eec7685062c06e327d1f06a773e
FROM gcr.io/distroless/base-debian12:debug-nonroot@sha256:d53efe9604cae04e8c02df63e3b22040c64e2db505e0074325a6bc1b710a0ada
WORKDIR /
COPY --from=go-builder /workspace/bin/manager .
USER 65532:65532
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/pomerium/ingress-controller

go 1.20
go 1.21

require (
github.com/cenkalti/backoff/v4 v4.2.1
Expand All @@ -18,6 +18,7 @@ require (
github.com/iancoleman/strcase v0.3.0
github.com/martinlindhe/base36 v1.1.1
github.com/open-policy-agent/opa v0.57.0
github.com/pomerium/csrf v1.7.0
github.com/pomerium/pomerium v0.23.1-0.20231024153910-1996550c541e
github.com/rs/zerolog v1.31.0
github.com/sergi/go-diff v1.3.1
Expand Down Expand Up @@ -243,7 +244,6 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/polyfloyd/go-errorlint v1.4.4 // indirect
github.com/pomerium/csrf v1.7.0 // indirect
github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524 // indirect
github.com/pomerium/webauthn v0.0.0-20221118023040-00a9c430578b // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
Expand Down
Loading

0 comments on commit 2a19655

Please sign in to comment.