github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-02 17:35:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/multus-4.0

Browse Source
This commit is contained in:
Tomofumi Hayashi
2022-04-19 00:14:32 +09:00
parent 13e4b3a1c4 706de7c2c6
commit 10fcc49f4d
11 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -4,7 +4,7 @@ jobs:
build: build:
strategy: strategy:
matrix: matrix:
go-version: [1.16.x, 1.17.x] go-version: [1.17.x, 1.18.x]
goarch: [386, amd64, arm, arm64, ppc64le, s390x] goarch: [386, amd64, arm, arm64, ppc64le, s390x]
os: [ubuntu-latest] #, macos-latest, windows-latest] os: [ubuntu-latest] #, macos-latest, windows-latest]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}

2
.github/workflows/release.yml vendored
View File

@@ -15,7 +15,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.15.x go-version: 1.17.x
- name: Run GoReleaser - name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2 uses: goreleaser/goreleaser-action@v2

2
.github/workflows/test.yml vendored
View File

@@ -4,7 +4,7 @@ jobs:
test: test:
strategy: strategy:
matrix: matrix:
go-version: [1.16.x, 1.17.x] go-version: [1.17.x, 1.18.x]
os: [ubuntu-latest] os: [ubuntu-latest]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:

2
cmd/multus-daemon/main.go
View File

@@ -49,7 +49,6 @@ const (
defaultMultusMasterCNIFile = "" defaultMultusMasterCNIFile = ""
defaultMultusNamespaceIsolation = false defaultMultusNamespaceIsolation = false
defaultMultusReadinessIndicatorFile = "" defaultMultusReadinessIndicatorFile = ""
defaultMultusRunDir = "/host/run/multus-cni/"
) )
const ( const (
@@ -68,7 +67,6 @@ const (
multusMasterCNIFileVarName = "multus-master-cni-file" multusMasterCNIFileVarName = "multus-master-cni-file"
multusNamespaceIsolation = "namespace-isolation" multusNamespaceIsolation = "namespace-isolation"
multusReadinessIndicatorFile = "readiness-indicator-file" multusReadinessIndicatorFile = "readiness-indicator-file"
multusRunDir = "multus-rundir"
) )
func main() { func main() {

2
images/Dockerfile
View File

@@ -1,5 +1,5 @@
# This Dockerfile is used to build the image available on DockerHub # 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 everything
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni

2
images/Dockerfile.arm32
View File

@@ -1,5 +1,5 @@
# This Dockerfile is used to build the image available on DockerHub # 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 everything
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni

2
images/Dockerfile.arm64
View File

@@ -1,5 +1,5 @@
# This Dockerfile is used to build the image available on DockerHub # 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 everything
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni

2
images/Dockerfile.ppc64le
View File

@@ -1,5 +1,5 @@
# This Dockerfile is used to build the image available on DockerHub # 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 everything
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni

2
images/Dockerfile.s390x
View File

@@ -1,5 +1,5 @@
# This Dockerfile is used to build the image available on DockerHub # 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 everything
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni

2
images/Dockerfile.thick
View File

@@ -1,5 +1,5 @@
# This Dockerfile is used to build the image available on DockerHub # 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 everything
ADD . /usr/src/multus-cni ADD . /usr/src/multus-cni

2
pkg/k8sclient/k8sclient.go
View File

@@ -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 // SetNetworkStatus sets network status into Pod annotation
func SetNetworkStatus(client *ClientInfo, k8sArgs *types.K8sArgs, netStatus []nettypes.NetworkStatus, conf *types.NetConf) error { func SetNetworkStatus(client *ClientInfo, k8sArgs *types.K8sArgs, netStatus []nettypes.NetworkStatus, conf *types.NetConf) error {