From fca57cee35da2e2195f2e9ad19d585ab83a610aa Mon Sep 17 00:00:00 2001 From: Taras Drozdovskyi Date: Sat, 2 Nov 2024 11:27:59 +0200 Subject: [PATCH] feat: Update go version Signed-off-by: Taras Drozdovskyi --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- .github/workflows/build.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/go-fuzz-test.yml | 2 +- .../lint-vet-gofmt-staticcheck-analysis.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/test-suite.yml | 2 +- configs/defdockerfiles/ubuntu | 9 ++++++--- configs/defdockerfiles/ubuntu_multistage | 13 ++++++++----- docs/platforms/x86_64_linux/x86_64_linux.md | 2 +- go.mod | 2 +- internal/common/resourceutil/resourceutil_test.go | 14 +++++++------- .../controller/configuremgr/configuremgr_test.go | 6 +++--- third_party/zeroconf/go.mod | 2 +- 14 files changed, 35 insertions(+), 29 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f20aa5b8..1b79a74a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -32,8 +32,8 @@ Example **Test Configuration**: * OS type & version: Ubuntu 20.04 * Hardware: x86-64 (e.g., x86, x86-64, arm, arm64) -* Toolchain: Docker v20.10 & Go v1.19 -* Edge Orchestration Release: v1.1.x +* Toolchain: Docker v20.10 & Go v1.23 +* Edge Orchestration Release: v1.2.x # Checklist: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d242546..bc8db3e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: '1.19' + go-version: '1.23' - name: Install Qemu if: ${{ matrix.arch != 'x86_64c' && matrix.arch != 'x86_64a' && matrix.arch != 'x86_64n'}} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 5ab99cdf..3d2e58b1 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -33,7 +33,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: '1.19' + go-version: '1.23' - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a diff --git a/.github/workflows/go-fuzz-test.yml b/.github/workflows/go-fuzz-test.yml index f2caf34a..9d83189e 100644 --- a/.github/workflows/go-fuzz-test.yml +++ b/.github/workflows/go-fuzz-test.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: '1.19' + go-version: '1.23' - name: Fuzz test run: | diff --git a/.github/workflows/lint-vet-gofmt-staticcheck-analysis.yml b/.github/workflows/lint-vet-gofmt-staticcheck-analysis.yml index e3b82aaa..aa23cec2 100644 --- a/.github/workflows/lint-vet-gofmt-staticcheck-analysis.yml +++ b/.github/workflows/lint-vet-gofmt-staticcheck-analysis.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: '1.19' + go-version: '1.23' - name: Set env vars (golint) run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 916c7cca..f6de78a3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: '1.19' + go-version: '1.23' - name: Set up QEMU uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 48c9a795..f95f8c40 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: '1.19' + go-version: '1.23' - name: Set env vars (gocov) run: | diff --git a/configs/defdockerfiles/ubuntu b/configs/defdockerfiles/ubuntu index dd65da34..7157560d 100644 --- a/configs/defdockerfiles/ubuntu +++ b/configs/defdockerfiles/ubuntu @@ -1,7 +1,7 @@ # Docker image for "edge-orchestration" ### ubuntu:20.04 ARG PLATFORM -FROM $PLATFORM/ubuntu:20.04 +FROM $PLATFORM/ubuntu:24.04 # environment variables ENV TARGET_DIR=/edge-orchestration @@ -24,8 +24,11 @@ RUN mkdir -p $TARGET_DIR/res/ COPY $WEB_DIR/$BUILD_DIR/ $TARGET_DIR/$WEB_DIR/ # install required tools -RUN apt-get update -RUN apt-get install -y net-tools iproute2 +# RUN apt-get update +# RUN apt-get install -y net-tools iproute2 + +RUN apt update +RUN apt install -y net-tools iproute2 # expose ports EXPOSE $HTTP_PORT $MDNS_PORT $ZEROCONF_PORT $MNEDC_PORT $MNEDC_BROADCAST_PORT $UI_PORT diff --git a/configs/defdockerfiles/ubuntu_multistage b/configs/defdockerfiles/ubuntu_multistage index 52210930..7cb3734d 100644 --- a/configs/defdockerfiles/ubuntu_multistage +++ b/configs/defdockerfiles/ubuntu_multistage @@ -1,9 +1,9 @@ # Docker image for "edge-orchestration" -FROM --platform=$TARGETPLATFORM ubuntu:20.04 AS builder +FROM --platform=$TARGETPLATFORM ubuntu:24.04 AS builder # environment variables ARG TARGETPLATFORM -ENV GOVERSION=1.19.1 +ENV GOVERSION=1.23.2 ENV GOPATH=/usr/local/go ENV TARGET_DIR=/edge-orchestration @@ -19,7 +19,7 @@ RUN script/install-golang.sh ARG TARGETVERSION RUN make buildx_binary VERSION=$TARGETVERSION -FROM ubuntu:20.04 +FROM ubuntu:24.04 # environment variables ENV TARGET_DIR=/edge-orchestration @@ -44,8 +44,11 @@ COPY --from=builder $TARGET_DIR/$WEB_DIR/$BUILD_DIR $TARGET_DIR/$WEB_DIR/ RUN mkdir -p $TARGET_DIR/res/ # install required tools -RUN apt-get update -RUN apt-get install -y net-tools iproute2 +# RUN apt-get update +# RUN apt-get install -y net-tools iproute2 + +RUN apt update +RUN apt install -y net-tools iproute2 # expose ports EXPOSE $HTTP_PORT $MDNS_PORT $ZEROCONF_PORT $MNEDC_PORT $MNEDC_BROADCAST_PORT $UI_PORT diff --git a/docs/platforms/x86_64_linux/x86_64_linux.md b/docs/platforms/x86_64_linux/x86_64_linux.md index e28bb4ab..62678e33 100644 --- a/docs/platforms/x86_64_linux/x86_64_linux.md +++ b/docs/platforms/x86_64_linux/x86_64_linux.md @@ -37,7 +37,7 @@ Please see the below [How to work](#how-to-work) to know how to run Edge Orchest `$ sudo usermod -aG docker $USER` - go compiler - - Version: 1.19 (or above) + - Version: 1.23 (or above) - [How to install](https://golang.org/dl/) > To build Edge Orchestrator from Go sources, you need to set GOPATH environment variable: diff --git a/go.mod b/go.mod index 86fbb802..293076dc 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/lf-edge/edge-home-orchestration-go -go 1.19 +go 1.23 require ( github.com/casbin/casbin v1.9.1 diff --git a/internal/common/resourceutil/resourceutil_test.go b/internal/common/resourceutil/resourceutil_test.go index 36f8e1e5..09f3cf87 100644 --- a/internal/common/resourceutil/resourceutil_test.go +++ b/internal/common/resourceutil/resourceutil_test.go @@ -258,7 +258,7 @@ func TestGetCPUUsage(t *testing.T) { cpuUsage, err := resourceIns.GetResource(CPUUsage) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } if cpuUsage != dummyCPUPercentResult { @@ -291,7 +291,7 @@ func TestGetCPUFreq(t *testing.T) { cpuFreq, err := resourceIns.GetResource(CPUFreq) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } if cpuFreq != dummyCPUFreqResult { @@ -324,7 +324,7 @@ func TestGetCPUCount(t *testing.T) { cpuCount, err := resourceIns.GetResource(CPUCount) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } if cpuCount != dummyCPUCountResult { @@ -357,7 +357,7 @@ func TestGetMemAvailable(t *testing.T) { memAvailable, err := resourceIns.GetResource(MemAvailable) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } if memAvailable != dummyMemAvailableResult { @@ -390,7 +390,7 @@ func TestGetMemFree(t *testing.T) { memFree, err := resourceIns.GetResource(MemFree) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } if memFree != dummyMemFreeResult { @@ -423,7 +423,7 @@ func TestGetNetMBps(t *testing.T) { netMBps, err := resourceIns.GetResource(NetMBps) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } if netMBps != dummyNetMBpsResult { @@ -456,7 +456,7 @@ func TestGetNetBandwidth(t *testing.T) { netBandwidth, err := resourceIns.GetResource(NetBandwidth) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } if netBandwidth != dummyNetBandwidthResult { diff --git a/internal/controller/configuremgr/configuremgr_test.go b/internal/controller/configuremgr/configuremgr_test.go index c8777f76..2c97cd09 100644 --- a/internal/controller/configuremgr/configuremgr_test.go +++ b/internal/controller/configuremgr/configuremgr_test.go @@ -62,7 +62,7 @@ func TestSetConfigPath(t *testing.T) { t.Errorf("%s != %s", defaultConfPath, configuremgrObj.confpath) } } else { - t.Errorf(err.Error()) + t.Error(err.Error()) } }) t.Run("No File", func(t *testing.T) { @@ -94,7 +94,7 @@ func TestBasicMockConfigureMgr(t *testing.T) { os.RemoveAll(dir) err := os.Mkdir(dir, 0775) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } else { files, err := os.ReadDir(src) if err != nil { @@ -104,7 +104,7 @@ func TestBasicMockConfigureMgr(t *testing.T) { fileContent, _ := os.ReadFile(filepath.Join(src, file.Name())) err = os.WriteFile(filepath.Join(dir, file.Name()), []byte(fileContent), 0664) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } } } diff --git a/third_party/zeroconf/go.mod b/third_party/zeroconf/go.mod index 1f85397b..c4ab1aa9 100644 --- a/third_party/zeroconf/go.mod +++ b/third_party/zeroconf/go.mod @@ -1,6 +1,6 @@ module github.com/grandcat/zeroconf -go 1.19 +go 1.23 require ( github.com/cenkalti/backoff v2.2.1+incompatible