Update network-attachment-definition-client for multus v3 (#996 )

Update network-attachment-definition-client package to support DeviceInfo spec 1.1.0 Signed-off-by: Yury Kulazhenkov <ykulazhenkov@nvidia.com> Signed-off-by: Yury Kulazhenkov <ykulazhenkov@nvidia.com>
Merge pull request #924 from k8snetworkplumbingwg/fix/image
2025-09-02 01:19:31 +00:00 · 2022-12-26 16:03:21 +09:00 · 2022-10-11 13:44:19 -04:00 · 2022-10-12 01:31:15 +09:00 · 2022-08-27 16:09:54 +09:00 · 2022-08-26 15:09:16 -04:00
14 changed files with 33 additions and 36 deletions
--- a/.github/workflows/image-push-release.yml
+++ b/.github/workflows/image-push-release.yml
@@ -47,7 +47,7 @@ jobs:
          context: .
          push: true
          tags: |
-            ghcr.io/${{ github.repository }}:thick-amd64
+            ghcr.io/${{ github.repository }}:stable-thick-amd64
            ${{ steps.docker_meta.outputs.tags }}-thick-amd64
          file: images/Dockerfile.thick

--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,11 +16,10 @@ jobs:
    - name: Checkout code
      uses: actions/checkout@v2

-    - name: Run Revive
-      run: |
-        GO111MODULE=off go get github.com/mgechev/revive
-        $(go env GOPATH)/bin/revive -exclude ./vendor/... ./... # this is ouput for user
-        $(go env GOPATH)/bin/revive -exclude ./vendor/... ./...| xargs -0 -r false # this is for github actions
+    - name: Run Revive Action by pulling pre-built image
+      uses: docker://morphy/revive-action:v2
+      with:
+        exclude: "./vendor/..."

    - name: Run go fmt
      run: go fmt ./...
--- a/deployments/multus-daemonset-thick-plugin.yml
+++ b/deployments/multus-daemonset-thick-plugin.yml
@@ -122,7 +122,7 @@ spec:
      serviceAccountName: multus
      containers:
        - name: kube-multus
-          image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick
+          image: ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9.2-thick-amd64
          command: [ "/usr/src/multus-cni/bin/multus-daemon" ]
          args:
            - "-cni-version=0.3.1"
@@ -146,7 +146,7 @@ spec:
              mountPath: /host/opt/cni/bin
      initContainers:
        - name: install-multus-binary
-          image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick
+          image: ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9.2-thick-amd64
          command:
            - "cp"
            - "/usr/src/multus-cni/bin/multus"
@@ -162,7 +162,7 @@ spec:
              mountPath: /host/opt/cni/bin
              mountPropagation: Bidirectional
        - name: generate-kubeconfig
-          image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick
+          image: ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9.2-thick-amd64
          command:
            - "/usr/src/multus-cni/bin/generate-kubeconfig"
          args:
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/containernetworking/cni v0.8.1
 	github.com/containernetworking/plugins v0.9.1
 	github.com/fsnotify/fsnotify v1.4.9
-	github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.2-0.20220511184442-64cfb249bdbe
+	github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.2-0.20221215110210-ad3f3381681f
 	github.com/onsi/ginkgo v1.12.1
 	github.com/onsi/gomega v1.10.3
 	github.com/pkg/errors v0.9.1
--- a/go.sum
+++ b/go.sum
@@ -363,8 +363,8 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.2-0.20220511184442-64cfb249bdbe h1:VPiaEz+bUnFjUBBz3NnvmXbOtTs5Vpyzrsx9hcp/caM=
-github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.2-0.20220511184442-64cfb249bdbe/go.mod h1:+1DpV8uIwteAhxNO0lgRox8gHkTG6w3OeDfAlg+qqjA=
+github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.2-0.20221215110210-ad3f3381681f h1:SVJhARCyy2mmDUegdEBnYyLqjB4h6BxsfN5rfehExuU=
+github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.2-0.20221215110210-ad3f3381681f/go.mod h1:+1DpV8uIwteAhxNO0lgRox8gHkTG6w3OeDfAlg+qqjA=
 github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -7,7 +7,7 @@ ADD . /usr/src/multus-cni
 RUN  cd /usr/src/multus-cni && \
     ./hack/build-go.sh

-FROM centos:centos7
+FROM python:slim
 LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
 COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
 COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE
--- a/images/Dockerfile.arm32
+++ b/images/Dockerfile.arm32
@@ -11,7 +11,7 @@ RUN  cd /usr/src/multus-cni && \
     ./hack/build-go.sh

 # build arm container
-FROM arm32v7/centos:7
+FROM arm32v7/python:slim
 LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
 COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
 COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE
--- a/images/Dockerfile.arm64
+++ b/images/Dockerfile.arm64
@@ -11,7 +11,7 @@ RUN  cd /usr/src/multus-cni && \
     ./hack/build-go.sh

 # build arm64 container
-FROM arm64v8/centos:7
+FROM arm64v8/python:slim
 LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
 COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
 COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE
--- a/images/Dockerfile.ppc64le
+++ b/images/Dockerfile.ppc64le
@@ -11,7 +11,7 @@ RUN  cd /usr/src/multus-cni && \
     ./hack/build-go.sh

 # build ppc container
-FROM ppc64le/centos:latest
+FROM ppc64le/python:slim
 LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
 COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
 COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE
--- a/images/Dockerfile.s390x
+++ b/images/Dockerfile.s390x
@@ -11,7 +11,7 @@ RUN  cd /usr/src/multus-cni && \
     ./hack/build-go.sh

 # build s390x container
-FROM s390x/python:3-slim
+FROM s390x/python:slim
 LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
 COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
 COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE
--- a/images/Dockerfile.thick
+++ b/images/Dockerfile.thick
@@ -7,7 +7,7 @@ ADD . /usr/src/multus-cni
 RUN  cd /usr/src/multus-cni && \
     ./hack/build-go.sh

-FROM registry.access.redhat.com/ubi8/ubi-minimal
+FROM debian:stable-slim
 LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni
 COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
 COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE
--- a/images/entrypoint.sh
+++ b/images/entrypoint.sh
@@ -83,10 +83,6 @@ function warn()
    log "WARN: {$1}"
 }

-if type python3 &> /dev/null; then
-	alias python=python3
-fi
-
 function checkCniVersion {
      cniversion_python_tmpfile=$(mktemp)
      cat << EOF > $cniversion_python_tmpfile
@@ -103,7 +99,7 @@ if version(v_top_level) >= v_040 and version(v_nested) < v_040:
    msg = "Multus cni version is %s while master plugin cni version is %s"
    print(msg % (v_top_level, v_nested))
 EOF
-      python $cniversion_python_tmpfile $1 $2
+      python3 $cniversion_python_tmpfile $1 $2
 }

 # Parse parameters given as arguments to this script.
@@ -364,7 +360,7 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then

      if [ "$OVERRIDE_NETWORK_NAME" == "true" ]; then
        MASTER_PLUGIN_NET_NAME="$(cat $MULTUS_AUTOCONF_DIR/$MASTER_PLUGIN | \
-            python -c 'import json,sys;print(json.load(sys.stdin)["name"])')"
+            python3 -c 'import json,sys;print(json.load(sys.stdin)["name"])')"
      else
        MASTER_PLUGIN_NET_NAME="multus-cni-network"
      fi
@@ -386,7 +382,7 @@ else:
 EOF

      NESTED_CAPABILITIES_STRING="$(cat $MULTUS_AUTOCONF_DIR/$MASTER_PLUGIN | \
-            python $capabilities_python_filter_tmpfile)"
+            python3 $capabilities_python_filter_tmpfile)"
      rm $capabilities_python_filter_tmpfile
      log "Nested capabilities string: $NESTED_CAPABILITIES_STRING"

--- a/vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1/types.go
+++ b/vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1/types.go
@@ -43,7 +43,7 @@ const (
 	DeviceInfoTypeVHostUser = "vhost-user"
 	DeviceInfoTypeMemif     = "memif"
 	DeviceInfoTypeVDPA      = "vdpa"
-	DeviceInfoVersion       = "1.0.0"
+	DeviceInfoVersion       = "1.1.0"
 )

 // DeviceInfo contains the information of the device associated
@@ -58,18 +58,20 @@ type DeviceInfo struct {
 }

 type PciDevice struct {
-	PciAddress   string `json:"pci-address,omitempty"`
-	Vhostnet     string `json:"vhost-net,omitempty"`
-	RdmaDevice   string `json:"rdma-device,omitempty"`
-	PfPciAddress string `json:"pf-pci-address,omitempty"`
+	PciAddress        string `json:"pci-address,omitempty"`
+	Vhostnet          string `json:"vhost-net,omitempty"`
+	RdmaDevice        string `json:"rdma-device,omitempty"`
+	PfPciAddress      string `json:"pf-pci-address,omitempty"`
+	RepresentorDevice string `json:"representor-device,omitempty"`
 }

 type VdpaDevice struct {
-	ParentDevice string `json:"parent-device,omitempty"`
-	Driver       string `json:"driver,omitempty"`
-	Path         string `json:"path,omitempty"`
-	PciAddress   string `json:"pci-address,omitempty"`
-	PfPciAddress string `json:"pf-pci-address,omitempty"`
+	ParentDevice      string `json:"parent-device,omitempty"`
+	Driver            string `json:"driver,omitempty"`
+	Path              string `json:"path,omitempty"`
+	PciAddress        string `json:"pci-address,omitempty"`
+	PfPciAddress      string `json:"pf-pci-address,omitempty"`
+	RepresentorDevice string `json:"representor-device,omitempty"`
 }

 const (
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -54,7 +54,7 @@ github.com/googleapis/gnostic/openapiv2
 github.com/imdario/mergo
 # github.com/json-iterator/go v1.1.10
 github.com/json-iterator/go
-# github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.2-0.20220511184442-64cfb249bdbe
+# github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.2-0.20221215110210-ad3f3381681f
 ## explicit
 github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io
 github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1
Author	SHA1	Message	Date
Yury K	80c0f6f0c4	Update network-attachment-definition-client for multus v3 (#996 ) Update network-attachment-definition-client package to support DeviceInfo spec 1.1.0 Signed-off-by: Yury Kulazhenkov <ykulazhenkov@nvidia.com> Signed-off-by: Yury Kulazhenkov <ykulazhenkov@nvidia.com>	2022-12-26 16:03:21 +09:00
Doug Smith	991a1b2c7f	Merge pull request #924 from k8snetworkplumbingwg/fix/image Fix release 3.x thick image tag to isolate from 4.0	2022-10-11 13:44:19 -04:00
Tomofumi Hayashi	e9b87fb05a	Fix release 3.x thick image tag to isolate from 4.0 Due to #900, image tag, ':thick', which is used in 4.0 and 3.x, gets user confused because thick image is not compatible between 4.0 and 3.x. This fix provides strict version name in deployment yaml to specify install image tag.	2022-10-12 01:31:15 +09:00
Doug Smith	25703fce21	Change container image to fedora from centos (#904 ) This change introduce fedora container for multus image. Co-authored-by: Tomofumi Hayashi <tohayash@redhat.com>	2022-08-27 16:09:54 +09:00
Doug Smith	6b38a213b1	Merge pull request #905 from s1061123/fix/revive Fix revive in CI	2022-08-26 15:09:16 -04:00
Tomofumi Hayashi	2068ea9f77	Fix revive in CI	2022-08-27 04:03:58 +09:00