From 1d9c8326cca8baf5739c3b4e58c1b6fabc720949 Mon Sep 17 00:00:00 2001 From: Kautilya Tripathi Date: Tue, 5 Nov 2024 19:46:46 +0530 Subject: [PATCH] dependencies: update backend + CI dependencies Signed-off-by: Kautilya Tripathi --- .github/workflows/app-artifacts-linux.yml | 2 +- .github/workflows/app-artifacts-mac.yml | 2 +- .github/workflows/app-artifacts-win.yml | 2 +- .github/workflows/app.yml | 6 +++--- .github/workflows/backend-test.yml | 2 +- Dockerfile | 2 +- backend/go.mod | 10 ++++++---- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/app-artifacts-linux.yml b/.github/workflows/app-artifacts-linux.yml index fe6d1e11c5..1c424adbac 100644 --- a/.github/workflows/app-artifacts-linux.yml +++ b/.github/workflows/app-artifacts-linux.yml @@ -25,7 +25,7 @@ jobs: uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: node-version: 20.x - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: '1.22.*' - name: App linux diff --git a/.github/workflows/app-artifacts-mac.yml b/.github/workflows/app-artifacts-mac.yml index fdd1cff92d..0d2882147a 100644 --- a/.github/workflows/app-artifacts-mac.yml +++ b/.github/workflows/app-artifacts-mac.yml @@ -33,7 +33,7 @@ jobs: cache-dependency-path: | app/package-lock.json frontend/package-lock.json - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: '1.22.*' cache-dependency-path: | diff --git a/.github/workflows/app-artifacts-win.yml b/.github/workflows/app-artifacts-win.yml index e0c7aa3629..707145b1d2 100644 --- a/.github/workflows/app-artifacts-win.yml +++ b/.github/workflows/app-artifacts-win.yml @@ -39,7 +39,7 @@ jobs: cache-dependency-path: | headlamp/app/package-lock.json headlamp/frontend/package-lock.json - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: '1.22.*' cache-dependency-path: | diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml index 0bdd183692..f6dcf73500 100644 --- a/.github/workflows/app.yml +++ b/.github/workflows/app.yml @@ -35,7 +35,7 @@ jobs: uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: node-version: ${{ matrix.node-version }} - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: '1.22.*' - name: App linux @@ -52,7 +52,7 @@ jobs: uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: node-version: ${{ matrix.node-version }} - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: '1.22.*' - name: Dependencies @@ -72,7 +72,7 @@ jobs: uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: node-version: ${{ matrix.node-version }} - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: '1.22.*' - name: Dependencies diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml index 17e26e3f5c..90de5b6df7 100644 --- a/.github/workflows/backend-test.yml +++ b/.github/workflows/backend-test.yml @@ -28,7 +28,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: go-version: '1.22.*' diff --git a/Dockerfile b/Dockerfile index b953885c71..48dbdeab7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG IMAGE_BASE=alpine:3.20.3@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d FROM ${IMAGE_BASE} as image-base -FROM --platform=${BUILDPLATFORM} golang:1.22@sha256:a66eda637829ce891e9cf61ff1ee0edf544e1f6c5b0e666c7310dce231a66f28 as backend-build +FROM --platform=${BUILDPLATFORM} golang:1.22@sha256:0ca97f4ab335f4b284a5b8190980c7cdc21d320d529f2b643e8a8733a69bfb6b as backend-build WORKDIR /headlamp diff --git a/backend/go.mod b/backend/go.mod index 6dcd8e89e6..d0315defec 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,6 +1,6 @@ module github.com/headlamp-k8s/headlamp/backend -go 1.22.4 +go 1.22.8 require ( github.com/fsnotify/fsnotify v1.7.0 @@ -27,7 +27,11 @@ require ( sigs.k8s.io/yaml v1.4.0 ) -require github.com/coreos/go-oidc/v3 v3.11.0 +require ( + github.com/coreos/go-oidc/v3 v3.11.0 + github.com/gorilla/websocket v1.5.3 + gopkg.in/yaml.v2 v2.4.0 +) require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20240716105424-66b64c4bb379 // indirect @@ -80,7 +84,6 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect - github.com/gorilla/websocket v1.5.3 // indirect github.com/gosuri/uitable v0.0.4 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect @@ -150,7 +153,6 @@ require ( google.golang.org/protobuf v1.34.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.30.3 // indirect k8s.io/apiserver v0.30.3 // indirect