diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml index 86e0c7f6..15cbcadc 100644 --- a/.github/workflows/code-style.yaml +++ b/.github/workflows/code-style.yaml @@ -37,13 +37,13 @@ jobs: - tool: gofmt options: -s - tool: goimports - importpath: golang.org/x/tools/cmd/goimports + importpath: golang.org/x/tools/cmd/goimports@latest steps: - - name: Set up Go 1.17.x + - name: Set up Go 1.18.x uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x id: go - name: Check out code @@ -53,7 +53,7 @@ jobs: if: ${{ matrix.importpath != '' }} run: | cd $(mktemp -d) - GO111MODULE=on go get ${{ matrix.importpath }} + GO111MODULE=on go install ${{ matrix.importpath }} - name: ${{ matrix.tool }} ${{ matrix.options }} shell: bash @@ -88,10 +88,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.17.x + - name: Set up Go 1.18.x uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x id: go - name: Check out code @@ -109,7 +109,7 @@ jobs: echo '::endgroup::' echo '::group:: Installing misspell ... https://github.com/client9/misspell' - go get github.com/client9/misspell/cmd/misspell + go install github.com/client9/misspell/cmd/misspell@latest echo '::endgroup::' echo '::group:: Installing woke ... https://github.com/get-woke/woke' diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml index 1070d4b5..4e706290 100644 --- a/.github/workflows/e2e-test.yaml +++ b/.github/workflows/e2e-test.yaml @@ -13,7 +13,7 @@ jobs: name: End-to-end Tests strategy: matrix: - go-version: [1.17.x] + go-version: [1.18.x] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} defaults: diff --git a/.github/workflows/go-test.yaml b/.github/workflows/go-test.yaml index 78ad469e..652c842e 100644 --- a/.github/workflows/go-test.yaml +++ b/.github/workflows/go-test.yaml @@ -12,7 +12,7 @@ jobs: name: Unit Tests strategy: matrix: - go-version: [1.17.x] + go-version: [1.18.x] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} defaults: diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 83149c3e..4435a1b5 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -12,7 +12,7 @@ jobs: name: Smoke Tests strategy: matrix: - go-version: [1.17.x] + go-version: [1.18.x] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} if: ${{ github.event.workflow_run.conclusion == 'success' }} diff --git a/Dockerfile b/Dockerfile index e3918c10..de9748a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,23 @@ # Build the authorino binary -FROM registry.access.redhat.com/ubi8/go-toolset:1.17.10 as builder +FROM registry.access.redhat.com/ubi9-minimal:latest AS builder USER root +RUN microdnf install -y tar gzip +RUN arch=""; \ + case $(uname -m) in \ + x86_64) arch="amd64";; \ + aarch64) arch="arm64";; \ + esac; \ + curl -O -J "https://dl.google.com/go/go1.18.7.linux-${arch}.tar.gz"; \ + tar -C /usr/local -xzf go1.18.7.linux-${arch}.tar.gz; \ + ln -s /usr/local/go/bin/go /usr/local/bin/go WORKDIR /workspace COPY ./ ./ ARG version=latest RUN CGO_ENABLED=0 GO111MODULE=on go build -a -ldflags "-X main.version=${version}" -o authorino main.go # Use Red Hat minimal base image to package the binary -# https://catalog.redhat.com/software/containers/ubi8-minimal -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest +# https://catalog.redhat.com/software/containers/ubi9-minimal +FROM registry.access.redhat.com/ubi9-minimal:latest WORKDIR / COPY --from=builder /workspace/authorino . USER 1001 diff --git a/docs/contributing.md b/docs/contributing.md index 95a22e90..ad6db479 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -19,7 +19,7 @@ ## Technology stack for developers Minimum requirements to contribute to Authorino are: -- [Golang v1.17+](https://golang.org) +- [Golang v1.18+](https://golang.org) - [Docker](https://docker.com) Authorino's code was originally bundled using the [Operator SDK](https://sdk.operatorframework.io/) (v1.9.0). diff --git a/docs/user-guides/metrics.md b/docs/user-guides/metrics.md index 44cfc9c5..108d44ef 100644 --- a/docs/user-guides/metrics.md +++ b/docs/user-guides/metrics.md @@ -416,7 +416,7 @@ go_gc_pauses_seconds_total_count 26 go_goroutines 80 # HELP go_info Information about the Go environment. # TYPE go_info gauge -go_info{version="go1.17.7"} 1 +go_info{version="go1.18.7"} 1 # HELP go_memory_classes_heap_free_bytes Memory that is completely free and eligible to be returned to the underlying system, but has not been. This metric is the runtime's estimate of free address space that is backed by physical memory. # TYPE go_memory_classes_heap_free_bytes gauge go_memory_classes_heap_free_bytes 589824 @@ -815,7 +815,7 @@ go_gc_pauses_seconds_total_count 22 go_goroutines 79 # HELP go_info Information about the Go environment. # TYPE go_info gauge -go_info{version="go1.17.7"} 1 +go_info{version="go1.18.7"} 1 # HELP go_memory_classes_heap_free_bytes Memory that is completely free and eligible to be returned to the underlying system, but has not been. This metric is the runtime's estimate of free address space that is backed by physical memory. # TYPE go_memory_classes_heap_free_bytes gauge go_memory_classes_heap_free_bytes 630784 diff --git a/go.mod b/go.mod index 0083067b..2798e95f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kuadrant/authorino -go 1.17 +go 1.18 require ( github.com/coocood/freecache v1.1.1 diff --git a/go.sum b/go.sum index a1fd92de..ec7bd2ab 100644 --- a/go.sum +++ b/go.sum @@ -169,7 +169,6 @@ github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3k github.com/bytecodealliance/wasmtime-go v0.36.0 h1:B6thr7RMM9xQmouBtUqm1RpkJjuLS37m6nxX+iwsQSc= github.com/bytecodealliance/wasmtime-go v0.36.0/go.mod h1:q320gUxqyI8yB+ZqRuaJOEnGkAnHh6WtJjMaT2CW4wI= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= @@ -437,7 +436,6 @@ github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= @@ -837,8 +835,6 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -853,7 +849,6 @@ github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7 github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= -github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/open-policy-agent/opa v0.43.1 h1:GAtUd6aO5lObFP6rRpteXDVffKa4vGUF4I6qVLdhUng= github.com/open-policy-agent/opa v0.43.1/go.mod h1:xfTsKQEMvy7CxxgsCFoYuzT9jA/8C4JWLignCkN4Dzw= @@ -1471,7 +1466,6 @@ golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1853,7 +1847,6 @@ k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8 k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= @@ -1886,7 +1879,6 @@ sigs.k8s.io/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0Cwgq sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= -sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e h1:4Z09Hglb792X0kfOBBJUPFEyvVfQWrYT/l8h5EKA6JQ= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=