From 77ed17b392af8ea7ce21cb60376fde6d217b803f Mon Sep 17 00:00:00 2001 From: Tomofumi Hayashi Date: Tue, 12 Apr 2022 15:06:44 +0900 Subject: [PATCH 1/3] Fix letter --- cmd/controller/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/controller/main.go b/cmd/controller/main.go index e07d4361c..634bef5b8 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -62,7 +62,7 @@ const ( multusLogMaxSize = "multus-log-max-size" multusLogMaxAge = "multus-log-max-age" multusLogMaxBackups = "multus-log-max-backups" - multusLogCompress = "multus-log-Compress" + multusLogCompress = "multus-log-compress" multusLogLevel = "multus-log-level" multusLogToStdErr = "multus-log-to-stderr" multusKubeconfigPath = "multus-kubeconfig-file-host" From 4ada0c3ae8d4541364c73377dd950c0f68a55ca4 Mon Sep 17 00:00:00 2001 From: Tomofumi Hayashi Date: Thu, 14 Apr 2022 23:30:30 +0900 Subject: [PATCH 2/3] Update golang version to 1.17 --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- images/Dockerfile | 2 +- images/Dockerfile.arm32 | 2 +- images/Dockerfile.arm64 | 2 +- images/Dockerfile.ppc64le | 2 +- images/Dockerfile.s390x | 2 +- images/Dockerfile.thick | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a29ad8789..741fdba1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ jobs: build: strategy: matrix: - go-version: [1.16.x, 1.17.x] + go-version: [1.17.x, 1.18.x] goarch: [386, amd64, arm, arm64, ppc64le, s390x] os: [ubuntu-latest] #, macos-latest, windows-latest] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81b34a0c2..991b2b433 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.x - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2b2c96eb2..d2576819c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ jobs: test: strategy: matrix: - go-version: [1.16.x, 1.17.x] + go-version: [1.17.x, 1.18.x] os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: diff --git a/images/Dockerfile b/images/Dockerfile index 6b0ea31bf..e37bfc0ae 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -1,5 +1,5 @@ # This Dockerfile is used to build the image available on DockerHub -FROM golang:1.17.1 as build +FROM golang:1.17.9 as build # Add everything ADD . /usr/src/multus-cni diff --git a/images/Dockerfile.arm32 b/images/Dockerfile.arm32 index f8e953eef..3b26b26a1 100644 --- a/images/Dockerfile.arm32 +++ b/images/Dockerfile.arm32 @@ -1,5 +1,5 @@ # This Dockerfile is used to build the image available on DockerHub -FROM golang:1.17.1 as build +FROM golang:1.17.9 as build # Add everything ADD . /usr/src/multus-cni diff --git a/images/Dockerfile.arm64 b/images/Dockerfile.arm64 index 3a3cd916c..89eb8bb60 100644 --- a/images/Dockerfile.arm64 +++ b/images/Dockerfile.arm64 @@ -1,5 +1,5 @@ # This Dockerfile is used to build the image available on DockerHub -FROM golang:1.17.1 as build +FROM golang:1.17.9 as build # Add everything ADD . /usr/src/multus-cni diff --git a/images/Dockerfile.ppc64le b/images/Dockerfile.ppc64le index caf0a6431..f40c0e59f 100644 --- a/images/Dockerfile.ppc64le +++ b/images/Dockerfile.ppc64le @@ -1,5 +1,5 @@ # This Dockerfile is used to build the image available on DockerHub -FROM golang:1.17.1 as build +FROM golang:1.17.9 as build # Add everything ADD . /usr/src/multus-cni diff --git a/images/Dockerfile.s390x b/images/Dockerfile.s390x index 731c2a9b0..8736584eb 100644 --- a/images/Dockerfile.s390x +++ b/images/Dockerfile.s390x @@ -1,5 +1,5 @@ # This Dockerfile is used to build the image available on DockerHub -FROM golang:1.17 as build +FROM golang:1.17.9 as build # Add everything ADD . /usr/src/multus-cni diff --git a/images/Dockerfile.thick b/images/Dockerfile.thick index b359ac111..6068c6f53 100644 --- a/images/Dockerfile.thick +++ b/images/Dockerfile.thick @@ -1,5 +1,5 @@ # This Dockerfile is used to build the image available on DockerHub -FROM golang:1.17.1 as build +FROM golang:1.17.9 as build # Add everything ADD . /usr/src/multus-cni From 706de7c2c6a7d86401e1b0650bc050e4bdee984b Mon Sep 17 00:00:00 2001 From: jinglina Date: Mon, 18 Apr 2022 21:34:40 +0800 Subject: [PATCH 3/3] delete type conversion (#833) --- pkg/k8sclient/k8sclient.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/k8sclient/k8sclient.go b/pkg/k8sclient/k8sclient.go index 066e1ffab..d79962906 100644 --- a/pkg/k8sclient/k8sclient.go +++ b/pkg/k8sclient/k8sclient.go @@ -92,7 +92,7 @@ func (c *ClientInfo) Eventf(object runtime.Object, eventtype, reason, messageFmt } } -func (e *NoK8sNetworkError) Error() string { return string(e.message) } +func (e *NoK8sNetworkError) Error() string { return e.message } // SetNetworkStatus sets network status into Pod annotation func SetNetworkStatus(client *ClientInfo, k8sArgs *types.K8sArgs, netStatus []nettypes.NetworkStatus, conf *types.NetConf) error {