From 7b8f4c9b48354d33c72d99fbeec9d5aaf3abb4f3 Mon Sep 17 00:00:00 2001 From: Martin Kennelly Date: Thu, 29 Apr 2021 18:13:46 +0100 Subject: [PATCH 1/4] Add additional arch images & set default to GHCR Add workflows for ARM & ppc64le image creation. Create new "stable" image tag for each arch which can allow anyone consuming our software to stick to a static image tag. Set K8 artifacts images to reference GHCR. Update README and K8 artifacts to consume GHCR image. Signed-off-by: Martin Kennelly --- .github/workflows/image-push-master.yml | 65 ++++++++++++++- .github/workflows/image-push-release.yml | 81 ++++++++++++++++++- Makefile | 2 +- README.md | 57 ++++++------- .../k8s-v1.10-v1.15/sriovdp-daemonset.yaml | 4 +- deployments/k8s-v1.16/sriovdp-daemonset.yaml | 8 +- docs/config-file/README.md | 2 +- images/README.md | 4 +- 8 files changed, 179 insertions(+), 44 deletions(-) diff --git a/.github/workflows/image-push-master.yml b/.github/workflows/image-push-master.yml index 4120b291d..405cdb2d7 100644 --- a/.github/workflows/image-push-master.yml +++ b/.github/workflows/image-push-master.yml @@ -4,7 +4,9 @@ on: branches: - master jobs: - build-and-push-device-plugin: + build-and-push-amd64-device-plugin: + if: github.repository_owner == 'k8snetworkplumbingwg' + name: Image push AMD64 runs-on: ubuntu-20.04 env: IMAGE_NAME: ghcr.io/${{ github.repository }} @@ -29,5 +31,66 @@ jobs: push: true tags: | ${{ env.IMAGE_NAME }}:latest + ${{ env.IMAGE_NAME }}:latest-amd64 ${{ env.IMAGE_NAME }}:${{ github.sha }} file: images/Dockerfile + + build-and-push-arm64-device-plugin: + if: github.repository_owner == 'k8snetworkplumbingwg' + name: Image push ARM64 + runs-on: ubuntu-20.04 + env: + IMAGE_NAME: ghcr.io/${{ github.repository }} + steps: + - name: Check out the repo + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build and push sriov-network-device-plugin + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: | + ${{ env.IMAGE_NAME }}:latest-arm64 + ${{ env.IMAGE_NAME }}:${{ github.sha }} + file: images/Dockerfile.arm64 + + build-and-push-ppc64le-device-plugin: + if: github.repository_owner == 'k8snetworkplumbingwg' + name: Image push ppc64le + runs-on: ubuntu-20.04 + env: + IMAGE_NAME: ghcr.io/${{ github.repository }} + steps: + - name: Check out the repo + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build and push sriov-network-device-plugin + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: | + ${{ env.IMAGE_NAME }}:latest-ppc64le + ${{ env.IMAGE_NAME }}:${{ github.sha }} + file: images/Dockerfile.ppc64le diff --git a/.github/workflows/image-push-release.yml b/.github/workflows/image-push-release.yml index 02bd5921a..bfda85c98 100644 --- a/.github/workflows/image-push-release.yml +++ b/.github/workflows/image-push-release.yml @@ -4,7 +4,9 @@ on: tags: - v* jobs: - build-and-push-image-device-plugin: + build-and-push-amd64-device-plugin: + if: github.repository_owner == 'k8snetworkplumbingwg' + name: Image push AMD64 runs-on: ubuntu-20.04 env: IMAGE_NAME: ghcr.io/${{ github.repository }} @@ -36,4 +38,81 @@ jobs: push: true tags: | ${{ steps.docker_meta.outputs.tags }} + ${{ steps.docker_meta.outputs.tags }}-amd64 + ${{ env.IMAGE_NAME }}:stable-amd64 file: images/Dockerfile + + build-and-push-arm64-device-plugin: + if: github.repository_owner == 'k8snetworkplumbingwg' + name: Image push ARM64 + runs-on: ubuntu-20.04 + env: + IMAGE_NAME: ghcr.io/${{ github.repository }} + steps: + - name: Check out the repo + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Docker meta + id: docker_meta + uses: crazy-max/ghaction-docker-meta@v1 + with: + images: ${{ env.IMAGE_NAME }} + tag-latest: false + + - name: Build and push sriov-network-device-plugin + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: | + ${{ steps.docker_meta.outputs.tags }}-arm64 + ${{ env.IMAGE_NAME }}:stable-arm64 + file: images/Dockerfile.arm64 + + + build-and-push-ppc64le-device-plugin: + if: github.repository_owner == 'k8snetworkplumbingwg' + name: Image push ppc64le + runs-on: ubuntu-20.04 + env: + IMAGE_NAME: ghcr.io/${{ github.repository }} + steps: + - name: Check out the repo + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Docker meta + id: docker_meta + uses: crazy-max/ghaction-docker-meta@v1 + with: + images: ${{ env.IMAGE_NAME }} + tag-latest: false + + - name: Build and push sriov-network-device-plugin + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: | + ${{ steps.docker_meta.outputs.tags }}-ppc64le + ${{ env.IMAGE_NAME }}:stable-ppc64le + file: images/Dockerfile.ppc64le diff --git a/Makefile b/Makefile index 865ded237..10fc4a4b2 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ COVERAGE_XML = $(COVERAGE_DIR)/coverage.xml COVERAGE_HTML = $(COVERAGE_DIR)/index.html # Docker image DOCKERFILE?=$(CURDIR)/images/Dockerfile -TAG=docker.io/nfvpe/sriov-device-plugin +TAG?=ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin # Docker arguments - To pass proxy for Docker invoke it as 'make image HTTP_POXY=http://192.168.0.1:8080' DOCKERARGS= ifdef HTTP_PROXY diff --git a/README.md b/README.md index ebde5fd3d..a70c53724 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,9 @@ - [Features](#features) - [Supported SR-IOV NICs](#supported-sr-iov-nics) - [Quick Start](#quick-start) - - [Build SR-IOV CNI](#build-sr-iov-cni) - - [Build and run SR-IOV Network Device Plugin](#build-and-run-sr-iov-network-device-plugin) + - [Install SR-IOV CNI](#install-sr-iov-cni) + - [Get SR-IOV Network Device Plugin container image](#get-sr-iov-network-device-plugin-container-image) + - [Install SR-IOV Network Device Plugin](#install-sr-iov-network-device-plugin) - [Install one compatible CNI meta plugin](#install-one-compatible-cni-meta-plugin) - [Configurations](#configurations) - [Config parameters](#config-parameters) @@ -75,45 +76,40 @@ The following NICs were tested with this implementation. However, other SR-IOV Before starting the SR-IOV Network Device Plugin you will need to create SR-IOV Virtual Functions on your system. [The VF Setup doc will guide you through that process.](docs/vf-setup.md) -### Build SR-IOV CNI +### Install SR-IOV CNI -1. Compile SR-IOV-CNI (supported from release 2.0+): +See the [SR-IOV CNI](https://github.com/k8snetworkplumbingwg/sriov-cni) repository for build and installation instructions. Supported from SR-IOV CNI release 2.0+. + +### Get SR-IOV Network Device Plugin container image +#### GitHub ``` -$ git clone https://github.com/k8snetworkplumbingwg/sriov-cni.git -$ cd sriov-cni -$ make -$ cp build/sriov /opt/cni/bin +$ docker pull ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-amd64 +``` +#### Docker +``` +$ docker pull docker.io/nfvpe/sriov-device-plugin:${LATEST_TAGGED_RELEASE} ``` -### Build and run SR-IOV Network Device Plugin - -You can either build the docker image locally or pull it from [docker hub](https://hub.docker.com/r/nfvpe/sriov-device-plugin/). - -If you want to build the docker image locally then follow the following steps: - - 1. Clone the sriov-network-device-plugin - ``` -$ git clone https://github.com/k8snetworkplumbingwg/sriov-network-device-plugin.git -$ cd sriov-network-device-plugin - ``` - 2. Build docker image binary using `make` - ``` +#### Build image locally +``` $ make image ``` -> On a successful build, a docker image with tag `nfvpe/sriov-device-plugin:latest` will be created. You will need to build this image on each node. Alternatively, you could use a local docker registry to host this image. +> On a successful build, a docker image with tag `ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest` will be created. You will need to build this image on each node. Alternatively, you could use a local docker registry to host this image. + +### Install SR-IOV Network Device Plugin +#### Deploy config map +Create a ConfigMap that defines SR-IOV resource pool configuration - 3. Create a ConfigMap that defines SR-IOV resource pool configuration - - > Make sure to update the 'config.json' entry in the configMap data to reflect your resource configuration for the device plugin. See [Configurations](#configurations) section for supported configuration parameters. +> Make sure to update the 'config.json' entry in the configMap data to reflect your resource configuration for the device plugin. See [Configurations](#configurations) section for supported configuration parameters. - ``` +``` $ kubectl create -f deployments/configMap.yaml ``` - 4. Deploy SR-IOV Network Device Plugin Daemonset +#### Deploy daemonset ``` $ kubectl create -f deployments/k8s-v1.16/sriovdp-daemonset.yaml ``` -> For K8s version v1.15 or older use `deployments/k8s-v1.10-v1.15/sriovdp-daemonset.yaml` instead. +> For K8s version v1.15 or earlier use `deployments/k8s-v1.10-v1.15/sriovdp-daemonset.yaml` instead. ### Install one compatible CNI meta plugin @@ -530,6 +526,7 @@ For more information refer to [this](./docs/dpdk/README-virt.md). The supported architectures: * AMD64 +* ARM64 * PPC64LE Buiding image for AMD64: @@ -539,11 +536,9 @@ $ DOCKERFILE=Dockerfile make image Buiding image for PPC64LE: ``` -$ DOCKERFILE=images/Dockerfile.ppc64le TAG=nfvpe/sriov-device-plugin:ppc64le make image +$ DOCKERFILE=images/Dockerfile.ppc64le TAG=ghcr.io/k8snetworkplumbingwg/sriov-device-plugin:latest-ppc64le make image ``` ## Issues and Contributing We welcome your feedback and contributions to this project. Please see the [CONTRIBUTING.md](CONTRIBUTING.md) for contribution guidelines. - -Copyright 2018 © Intel Corporation. diff --git a/deployments/k8s-v1.10-v1.15/sriovdp-daemonset.yaml b/deployments/k8s-v1.10-v1.15/sriovdp-daemonset.yaml index 4791a5aee..1b86d06ef 100644 --- a/deployments/k8s-v1.10-v1.15/sriovdp-daemonset.yaml +++ b/deployments/k8s-v1.10-v1.15/sriovdp-daemonset.yaml @@ -31,7 +31,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp - image: docker.io/nfvpe/sriov-device-plugin:v3.3 + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-amd64 imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp @@ -93,7 +93,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp - image: docker.io/nfvpe/sriov-device-plugin:ppc64le + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-ppc64le imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp diff --git a/deployments/k8s-v1.16/sriovdp-daemonset.yaml b/deployments/k8s-v1.16/sriovdp-daemonset.yaml index 2e2b514eb..b7f11004c 100644 --- a/deployments/k8s-v1.16/sriovdp-daemonset.yaml +++ b/deployments/k8s-v1.16/sriovdp-daemonset.yaml @@ -35,7 +35,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp - image: docker.io/nfvpe/sriov-device-plugin:v3.3 + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-amd64 imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp @@ -107,7 +107,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp - image: docker.io/nfvpe/sriov-device-plugin:ppc64le + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-ppc64le imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp @@ -178,9 +178,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp -# this is a temporary image repository for arm64 architecture, util CI/CD of the -# sriov-device-plugin will not allow to recreate multiple images - image: alexeyperevalov/arm64-sriov-device-plugin + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-arm64 imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp diff --git a/docs/config-file/README.md b/docs/config-file/README.md index 1b6350237..9afff46ab 100644 --- a/docs/config-file/README.md +++ b/docs/config-file/README.md @@ -54,7 +54,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp - image: docker.io/nfvpe/sriov-device-plugin + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-amd64 imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp diff --git a/images/README.md b/images/README.md index 801481701..e36aac419 100644 --- a/images/README.md +++ b/images/README.md @@ -5,7 +5,7 @@ This is used for distribution of SR-IOV Device Plugin binary in a Docker image. Typically you'd build this from the root of your SR-IOV network device plugin clone, and you'd set the `-f` flag to specify the Dockerfile during build time. This allows the addition of the entirety of the SR-IOV network device plugin git clone as part of the Docker context. Use the `-f` flag with the root of the clone as the context (e.g. your current work directory would be root of git clone), such as: ``` -$ docker build -t docker.io/nfvpe/sriov-device-plugin -f ./images/Dockerfile . +$ docker build -t ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin -f ./images/Dockerfile . ``` You can run `make image` to build the docker image as well. @@ -29,7 +29,7 @@ Note: The likely best practice here is to build your own image given the Dockerf Example docker run command: ``` -$ docker run -it -v /var/lib/kubelet/:/var/lib/kubelet/ -v /sys/class/net:/sys/class/net --entrypoint=/bin/bash docker.io/nfvpe/sriovdp +$ docker run -it -v /var/lib/kubelet/:/var/lib/kubelet/ -v /sys/class/net:/sys/class/net --entrypoint=/bin/bash ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin ``` Originally inspired by and is a portmanteau of the [Flannel daemonset](https://github.com/coreos/flannel/blob/master/Documentation/kube-flannel.yml), the [Calico Daemonset](https://github.com/projectcalico/calico/blob/master/v2.0/getting-started/kubernetes/installation/hosted/k8s-backend-addon-manager/calico-daemonset.yaml), and the [Calico CNI install bash script](https://github.com/projectcalico/cni-plugin/blob/be4df4db2e47aa7378b1bdf6933724bac1f348d0/k8s-install/scripts/install-cni.sh#L104-L153). From 749357525c9fb823b3525bf7095b3c49f1a524ae Mon Sep 17 00:00:00 2001 From: Martin Kennelly Date: Thu, 22 Jul 2021 15:59:08 +0100 Subject: [PATCH 2/4] Fix building non-x86 images on incorrect arch Utilise emulate to build POWER8/ARM images on x86 host. Signed-off-by: Martin Kennelly --- .github/workflows/image-push-master.yml | 8 ++++++++ .github/workflows/image-push-release.yml | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/image-push-master.yml b/.github/workflows/image-push-master.yml index 405cdb2d7..f1fcc6ec6 100644 --- a/.github/workflows/image-push-master.yml +++ b/.github/workflows/image-push-master.yml @@ -45,6 +45,9 @@ jobs: - name: Check out the repo uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -59,6 +62,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . + platforms: linux/arm64 push: true tags: | ${{ env.IMAGE_NAME }}:latest-arm64 @@ -75,6 +79,9 @@ jobs: - name: Check out the repo uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -89,6 +96,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . + platforms: linux/ppc64le push: true tags: | ${{ env.IMAGE_NAME }}:latest-ppc64le diff --git a/.github/workflows/image-push-release.yml b/.github/workflows/image-push-release.yml index bfda85c98..a826dbd5e 100644 --- a/.github/workflows/image-push-release.yml +++ b/.github/workflows/image-push-release.yml @@ -52,6 +52,9 @@ jobs: - name: Check out the repo uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -73,13 +76,13 @@ jobs: uses: docker/build-push-action@v2 with: context: . + platforms: linux/arm64 push: true tags: | ${{ steps.docker_meta.outputs.tags }}-arm64 ${{ env.IMAGE_NAME }}:stable-arm64 file: images/Dockerfile.arm64 - build-and-push-ppc64le-device-plugin: if: github.repository_owner == 'k8snetworkplumbingwg' name: Image push ppc64le @@ -90,6 +93,9 @@ jobs: - name: Check out the repo uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -111,6 +117,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . + platforms: linux/ppc64le push: true tags: | ${{ steps.docker_meta.outputs.tags }}-ppc64le From a965d8bcc9ecb57ace7adfbc7630275ea90e81d4 Mon Sep 17 00:00:00 2001 From: Martin Kennelly Date: Thu, 22 Jul 2021 19:07:56 +0100 Subject: [PATCH 3/4] Revert additional image tags Signed-off-by: Martin Kennelly --- .github/workflows/image-push-master.yml | 2 -- .github/workflows/image-push-release.yml | 4 ---- deployments/k8s-v1.10-v1.15/sriovdp-daemonset.yaml | 4 ++-- deployments/k8s-v1.16/sriovdp-daemonset.yaml | 6 +++--- docs/config-file/README.md | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/image-push-master.yml b/.github/workflows/image-push-master.yml index f1fcc6ec6..2def24a7a 100644 --- a/.github/workflows/image-push-master.yml +++ b/.github/workflows/image-push-master.yml @@ -66,7 +66,6 @@ jobs: push: true tags: | ${{ env.IMAGE_NAME }}:latest-arm64 - ${{ env.IMAGE_NAME }}:${{ github.sha }} file: images/Dockerfile.arm64 build-and-push-ppc64le-device-plugin: @@ -100,5 +99,4 @@ jobs: push: true tags: | ${{ env.IMAGE_NAME }}:latest-ppc64le - ${{ env.IMAGE_NAME }}:${{ github.sha }} file: images/Dockerfile.ppc64le diff --git a/.github/workflows/image-push-release.yml b/.github/workflows/image-push-release.yml index a826dbd5e..2782df50e 100644 --- a/.github/workflows/image-push-release.yml +++ b/.github/workflows/image-push-release.yml @@ -38,8 +38,6 @@ jobs: push: true tags: | ${{ steps.docker_meta.outputs.tags }} - ${{ steps.docker_meta.outputs.tags }}-amd64 - ${{ env.IMAGE_NAME }}:stable-amd64 file: images/Dockerfile build-and-push-arm64-device-plugin: @@ -80,7 +78,6 @@ jobs: push: true tags: | ${{ steps.docker_meta.outputs.tags }}-arm64 - ${{ env.IMAGE_NAME }}:stable-arm64 file: images/Dockerfile.arm64 build-and-push-ppc64le-device-plugin: @@ -121,5 +118,4 @@ jobs: push: true tags: | ${{ steps.docker_meta.outputs.tags }}-ppc64le - ${{ env.IMAGE_NAME }}:stable-ppc64le file: images/Dockerfile.ppc64le diff --git a/deployments/k8s-v1.10-v1.15/sriovdp-daemonset.yaml b/deployments/k8s-v1.10-v1.15/sriovdp-daemonset.yaml index 1b86d06ef..3cd505122 100644 --- a/deployments/k8s-v1.10-v1.15/sriovdp-daemonset.yaml +++ b/deployments/k8s-v1.10-v1.15/sriovdp-daemonset.yaml @@ -31,7 +31,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp - image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-amd64 + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:v3.3.2 imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp @@ -93,7 +93,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp - image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-ppc64le + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest-ppc64le imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp diff --git a/deployments/k8s-v1.16/sriovdp-daemonset.yaml b/deployments/k8s-v1.16/sriovdp-daemonset.yaml index b7f11004c..f21bc14a8 100644 --- a/deployments/k8s-v1.16/sriovdp-daemonset.yaml +++ b/deployments/k8s-v1.16/sriovdp-daemonset.yaml @@ -35,7 +35,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp - image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-amd64 + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:v3.3.2 imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp @@ -107,7 +107,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp - image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-ppc64le + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest-ppc64le imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp @@ -178,7 +178,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp - image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-arm64 + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest-arm64 imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp diff --git a/docs/config-file/README.md b/docs/config-file/README.md index 9afff46ab..41f20312f 100644 --- a/docs/config-file/README.md +++ b/docs/config-file/README.md @@ -54,7 +54,7 @@ spec: serviceAccountName: sriov-device-plugin containers: - name: kube-sriovdp - image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-amd64 + image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest imagePullPolicy: IfNotPresent args: - --log-dir=sriovdp From 830eabc38aecb3d51092ac16504b72dfe2d64ebf Mon Sep 17 00:00:00 2001 From: Martin Kennelly Date: Fri, 23 Jul 2021 13:58:20 +0100 Subject: [PATCH 4/4] Remove Dockerhub support from README Signed-off-by: Martin Kennelly --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index a70c53724..3878be185 100644 --- a/README.md +++ b/README.md @@ -83,11 +83,7 @@ See the [SR-IOV CNI](https://github.com/k8snetworkplumbingwg/sriov-cni) reposito ### Get SR-IOV Network Device Plugin container image #### GitHub ``` -$ docker pull ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:stable-amd64 -``` -#### Docker -``` -$ docker pull docker.io/nfvpe/sriov-device-plugin:${LATEST_TAGGED_RELEASE} +$ docker pull ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:latest ``` #### Build image locally