From 6d06c316bded566dfd062bc2eac415d5381fe166 Mon Sep 17 00:00:00 2001 From: Joel Takvorian Date: Mon, 17 Jun 2024 10:33:33 +0200 Subject: [PATCH] NETOBSERV-1707: move to go 1.22 --- .github/workflows/pull_request.yml | 2 +- .github/workflows/push_image.yml | 4 ++-- .github/workflows/push_image_pr.yml | 2 +- .github/workflows/release.yml | 2 +- .golangci.yml | 2 +- Dockerfile | 2 +- Dockerfile.ci | 2 +- Dockerfile.cypress | 2 +- web/src/components/messages/error.tsx | 1 + 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 259c81288..8d7663376 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -26,7 +26,7 @@ jobs: - name: check clean vendors run: go mod vendor - name: Report coverage - if: ${{ matrix.go == '1.21' }} + if: ${{ matrix.go == '1.22' }} uses: codecov/codecov-action@v4 with: files: ./cover.out diff --git a/.github/workflows/push_image.yml b/.github/workflows/push_image.yml index 685e7a2d7..bdceacea9 100644 --- a/.github/workflows/push_image.yml +++ b/.github/workflows/push_image.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ['1.21'] + go: ['1.22'] steps: - name: install make run: sudo apt-get install make @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ['1.21'] + go: ['1.22'] steps: - name: install make run: sudo apt-get install make diff --git a/.github/workflows/push_image_pr.yml b/.github/workflows/push_image_pr.yml index 56619957a..588ad3c26 100644 --- a/.github/workflows/push_image_pr.yml +++ b/.github/workflows/push_image_pr.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ['1.21'] + go: ['1.22'] steps: - name: install make run: sudo apt-get install make diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6f3c3eae..94d256491 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ['1.21'] + go: ['1.22'] steps: - name: checkout uses: actions/checkout@v3 diff --git a/.golangci.yml b/.golangci.yml index 42088e4f2..370e1c36f 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -18,7 +18,7 @@ linters: - unused linters-settings: stylecheck: - go: "1.21" + go: "1.22" gocritic: enabled-checks: - hugeParam diff --git a/Dockerfile b/Dockerfile index 8c03a420d..025f00e2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ WORKDIR /opt/app-root/web RUN npm run format-all RUN npm run build$BUILDSCRIPT -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21 as go-builder +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22 as go-builder ARG TARGETPLATFORM ARG TARGETARCH=amd64 diff --git a/Dockerfile.ci b/Dockerfile.ci index 91a3fb05a..c667cb9ef 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM docker.io/library/golang:1.21 +FROM docker.io/library/golang:1.22 RUN apt-get update && apt-get install -y \ nodejs \ diff --git a/Dockerfile.cypress b/Dockerfile.cypress index 9d814f9cc..c9104ba26 100644 --- a/Dockerfile.cypress +++ b/Dockerfile.cypress @@ -20,7 +20,7 @@ WORKDIR /opt/app-root/web RUN npm run format-all RUN npm run build$BUILDSCRIPT -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21 as go-builder +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22 as go-builder ARG LDFLAGS WORKDIR /opt/app-root diff --git a/web/src/components/messages/error.tsx b/web/src/components/messages/error.tsx index 7c0f84f1b..90ced4561 100644 --- a/web/src/components/messages/error.tsx +++ b/web/src/components/messages/error.tsx @@ -259,6 +259,7 @@ export const Error: React.FC = ({ title, error, isLokiRelated }) => { target="_blank" to={{ pathname: + // eslint-disable-next-line max-len 'https://docs.openshift.com/container-platform/latest/observability/network_observability/installing-operators.html#network-observability-loki-installation_network_observability' }} />