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/cmd/multus-daemon/main.go b/cmd/multus-daemon/main.go index 6d6236f8a..2c7e77a09 100644 --- a/cmd/multus-daemon/main.go +++ b/cmd/multus-daemon/main.go @@ -49,7 +49,6 @@ const ( defaultMultusMasterCNIFile = "" defaultMultusNamespaceIsolation = false defaultMultusReadinessIndicatorFile = "" - defaultMultusRunDir = "/host/run/multus-cni/" ) const ( @@ -68,7 +67,6 @@ const ( multusMasterCNIFileVarName = "multus-master-cni-file" multusNamespaceIsolation = "namespace-isolation" multusReadinessIndicatorFile = "readiness-indicator-file" - multusRunDir = "multus-rundir" ) func main() { 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 diff --git a/pkg/k8sclient/k8sclient.go b/pkg/k8sclient/k8sclient.go index b9b4cef6f..5be2b3fc6 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 {