From 3a9cfb02b5be6e3de006a49042f0d2b140041a5d Mon Sep 17 00:00:00 2001 From: Ukri Niemimuukko Date: Wed, 16 Jun 2021 11:29:07 +0300 Subject: [PATCH 1/4] remove monitoring arg from fractional resource overlay An easter-egg slipped in the args. This removes it. Signed-off-by: Ukri Niemimuukko --- .../gpu_plugin/overlays/fractional_resources/add-args.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deployments/gpu_plugin/overlays/fractional_resources/add-args.yaml b/deployments/gpu_plugin/overlays/fractional_resources/add-args.yaml index c1b5ba7b3..a438bab4c 100644 --- a/deployments/gpu_plugin/overlays/fractional_resources/add-args.yaml +++ b/deployments/gpu_plugin/overlays/fractional_resources/add-args.yaml @@ -9,5 +9,4 @@ spec: - name: intel-gpu-plugin args: - "-shared-dev-num=300" - - "-enable-monitoring" - "-resource-manager" From 6d2bbb59a4518cd5c6365da4d1ca3b9262ffed52 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Tue, 15 Jun 2021 21:33:17 +0300 Subject: [PATCH 2/4] images: lock Clear Linux version for the release Signed-off-by: Mikko Ylinen --- demo/crypto-perf/Dockerfile | 4 ++-- demo/opae-nlb-demo/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/crypto-perf/Dockerfile b/demo/crypto-perf/Dockerfile index 3ae4e63a4..e0be7e6ce 100644 --- a/demo/crypto-perf/Dockerfile +++ b/demo/crypto-perf/Dockerfile @@ -6,11 +6,11 @@ # # This is used on release branches before tagging a stable version. # The main branch defaults to using the latest Clear Linux. -ARG CLEAR_LINUX_BASE=clearlinux:latest +ARG CLEAR_LINUX_BASE=clearlinux@sha256:2e600dc800b74f3af7ed9d6951340bcd1e4c113d43da001da63e4db7c053b191 FROM ${CLEAR_LINUX_BASE} as builder -ARG CLEAR_LINUX_VERSION= +ARG CLEAR_LINUX_VERSION="--version=34740" RUN mkdir /install_root && \ swupd os-install \ diff --git a/demo/opae-nlb-demo/Dockerfile b/demo/opae-nlb-demo/Dockerfile index c193e0afd..e3838a54d 100644 --- a/demo/opae-nlb-demo/Dockerfile +++ b/demo/opae-nlb-demo/Dockerfile @@ -6,11 +6,11 @@ # # This is used on release branches before tagging a stable version. # The main branch defaults to using the latest Clear Linux. -ARG CLEAR_LINUX_BASE=clearlinux:latest +ARG CLEAR_LINUX_BASE=clearlinux@sha256:2e600dc800b74f3af7ed9d6951340bcd1e4c113d43da001da63e4db7c053b191 FROM ${CLEAR_LINUX_BASE} as builder -ARG CLEAR_LINUX_VERSION= +ARG CLEAR_LINUX_VERSION="--version=34740" RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} && \ swupd bundle-add wget c-basic devpkg-json-c devpkg-util-linux devpkg-hwloc devpkg-tbb git From 725b98b0f1e70155eb334cc1931c2797cd70a2d5 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Tue, 15 Jun 2021 21:00:05 +0300 Subject: [PATCH 3/4] images: set 0.21.0 tag for the release Signed-off-by: Mikko Ylinen --- Makefile | 6 +++--- demo/intelfpga-job.yaml | 2 +- demo/test-fpga-orchestrated.yaml | 2 +- demo/test-fpga-preprogrammed.yaml | 2 +- deployments/dsa_plugin/base/intel-dsa-plugin.yaml | 2 +- deployments/fpga_admissionwebhook/manager/manager.yaml | 2 +- .../fpga_plugin/base/intel-fpga-plugin-daemonset.yaml | 4 ++-- deployments/gpu_plugin/base/intel-gpu-plugin.yaml | 4 ++-- deployments/operator/manager/manager.yaml | 2 +- .../operator/samples/deviceplugin_v1_dsadeviceplugin.yaml | 2 +- .../operator/samples/deviceplugin_v1_fpgadeviceplugin.yaml | 4 ++-- .../operator/samples/deviceplugin_v1_gpudeviceplugin.yaml | 4 ++-- .../operator/samples/deviceplugin_v1_qatdeviceplugin.yaml | 2 +- .../operator/samples/deviceplugin_v1_sgxdeviceplugin.yaml | 4 ++-- .../base/crypto-perf-dpdk-pod-requesting-qat.yaml | 2 +- deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml | 2 +- deployments/qat_plugin/base/intel-qat-plugin.yaml | 2 +- deployments/sgx_admissionwebhook/manager/manager.yaml | 2 +- deployments/sgx_plugin/base/intel-sgx-plugin.yaml | 2 +- .../overlays/epc-nfd/add-epc-nfd-initcontainer.yaml | 2 +- .../sgx_plugin/overlays/epc-register/init-daemonset.yaml | 2 +- deployments/vpu_plugin/base/intel-vpu-plugin.yaml | 2 +- 22 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index f5dc4528a..72e7ddfdc 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,9 @@ endif test-with-kind: @build/docker/build-image.sh intel/intel-fpga-admissionwebhook buildah - @$(PODMAN) tag localhost/intel/intel-fpga-admissionwebhook:devel docker.io/intel/intel-fpga-admissionwebhook:devel + @$(PODMAN) tag localhost/intel/intel-fpga-admissionwebhook:0.21.0 docker.io/intel/intel-fpga-admissionwebhook:0.21.0 @mkdir -p $(e2e_tmp_dir) - @$(PODMAN) save "docker.io/intel/intel-fpga-admissionwebhook:devel" -o $(e2e_tmp_dir)/$(WEBHOOK_IMAGE_FILE) + @$(PODMAN) save "docker.io/intel/intel-fpga-admissionwebhook:0.21.0" -o $(e2e_tmp_dir)/$(WEBHOOK_IMAGE_FILE) @$(KIND) create cluster --name "intel-device-plugins" --kubeconfig $(e2e_tmp_dir)/kubeconfig --image "kindest/node:v1.19.0" @$(KIND) load image-archive --name "intel-device-plugins" $(e2e_tmp_dir)/$(WEBHOOK_IMAGE_FILE) $(KUBECTL) --kubeconfig=$(e2e_tmp_dir)/kubeconfig apply -f https://github.com/jetstack/cert-manager/releases/download/v1.3.1/cert-manager.yaml @@ -118,7 +118,7 @@ clean: ORG?=intel REG?=$(ORG)/ -TAG?=devel +TAG?=0.21.0 export TAG pre-pull: diff --git a/demo/intelfpga-job.yaml b/demo/intelfpga-job.yaml index 883784660..b27b60421 100644 --- a/demo/intelfpga-job.yaml +++ b/demo/intelfpga-job.yaml @@ -13,7 +13,7 @@ spec: restartPolicy: Never containers: - name: intelfpga-demo-job-1 - image: intel/opae-nlb-demo:devel + image: intel/opae-nlb-demo:0.21.0 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/demo/test-fpga-orchestrated.yaml b/demo/test-fpga-orchestrated.yaml index 2c5e52334..01772de34 100644 --- a/demo/test-fpga-orchestrated.yaml +++ b/demo/test-fpga-orchestrated.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: intel/opae-nlb-demo:devel + image: intel/opae-nlb-demo:0.21.0 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/demo/test-fpga-preprogrammed.yaml b/demo/test-fpga-preprogrammed.yaml index 68f28fc1d..5cf6ce6aa 100644 --- a/demo/test-fpga-preprogrammed.yaml +++ b/demo/test-fpga-preprogrammed.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: intel/opae-nlb-demo:devel + image: intel/opae-nlb-demo:0.21.0 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/deployments/dsa_plugin/base/intel-dsa-plugin.yaml b/deployments/dsa_plugin/base/intel-dsa-plugin.yaml index 8b3aa910d..4fe494ead 100644 --- a/deployments/dsa_plugin/base/intel-dsa-plugin.yaml +++ b/deployments/dsa_plugin/base/intel-dsa-plugin.yaml @@ -20,7 +20,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-dsa-plugin:devel + image: intel/intel-dsa-plugin:0.21.0 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true diff --git a/deployments/fpga_admissionwebhook/manager/manager.yaml b/deployments/fpga_admissionwebhook/manager/manager.yaml index 1b311eea6..7cef40790 100644 --- a/deployments/fpga_admissionwebhook/manager/manager.yaml +++ b/deployments/fpga_admissionwebhook/manager/manager.yaml @@ -16,7 +16,7 @@ spec: control-plane: controller-manager spec: containers: - - image: intel/intel-fpga-admissionwebhook:devel + - image: intel/intel-fpga-admissionwebhook:0.21.0 imagePullPolicy: IfNotPresent name: manager securityContext: diff --git a/deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml b/deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml index 81871d0a6..efe125789 100644 --- a/deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml +++ b/deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml @@ -21,7 +21,7 @@ spec: spec: initContainers: - name: intel-fpga-initcontainer - image: intel/intel-fpga-initcontainer:devel + image: intel/intel-fpga-initcontainer:0.21.0 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true @@ -37,7 +37,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-fpga-plugin:devel + image: intel/intel-fpga-plugin:0.21.0 imagePullPolicy: IfNotPresent args: - -mode=af diff --git a/deployments/gpu_plugin/base/intel-gpu-plugin.yaml b/deployments/gpu_plugin/base/intel-gpu-plugin.yaml index 29c008829..b417d61e5 100644 --- a/deployments/gpu_plugin/base/intel-gpu-plugin.yaml +++ b/deployments/gpu_plugin/base/intel-gpu-plugin.yaml @@ -15,7 +15,7 @@ spec: spec: initContainers: - name: intel-gpu-initcontainer - image: intel/intel-gpu-initcontainer:devel + image: intel/intel-gpu-initcontainer:0.21.0 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true @@ -29,7 +29,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-gpu-plugin:devel + image: intel/intel-gpu-plugin:0.21.0 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true diff --git a/deployments/operator/manager/manager.yaml b/deployments/operator/manager/manager.yaml index 21c426362..57b666eb4 100644 --- a/deployments/operator/manager/manager.yaml +++ b/deployments/operator/manager/manager.yaml @@ -23,7 +23,7 @@ spec: control-plane: controller-manager spec: containers: - - image: intel/intel-deviceplugin-operator:devel + - image: intel/intel-deviceplugin-operator:0.21.0 imagePullPolicy: IfNotPresent name: manager resources: diff --git a/deployments/operator/samples/deviceplugin_v1_dsadeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_dsadeviceplugin.yaml index 69fa8d178..13b115916 100644 --- a/deployments/operator/samples/deviceplugin_v1_dsadeviceplugin.yaml +++ b/deployments/operator/samples/deviceplugin_v1_dsadeviceplugin.yaml @@ -3,6 +3,6 @@ kind: DsaDevicePlugin metadata: name: dsadeviceplugin-sample spec: - image: intel/intel-dsa-plugin:0.20.0 + image: intel/intel-dsa-plugin:0.21.0 sharedDevNum: 10 logLevel: 4 diff --git a/deployments/operator/samples/deviceplugin_v1_fpgadeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_fpgadeviceplugin.yaml index 372a3bdfa..3af185cdf 100644 --- a/deployments/operator/samples/deviceplugin_v1_fpgadeviceplugin.yaml +++ b/deployments/operator/samples/deviceplugin_v1_fpgadeviceplugin.yaml @@ -3,8 +3,8 @@ kind: FpgaDevicePlugin metadata: name: fpgadeviceplugin-sample spec: - image: intel/intel-fpga-plugin:0.20.0 - initImage: intel/intel-fpga-initcontainer:0.20.0 + image: intel/intel-fpga-plugin:0.21.0 + initImage: intel/intel-fpga-initcontainer:0.21.0 mode: region logLevel: 4 nodeSelector: diff --git a/deployments/operator/samples/deviceplugin_v1_gpudeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_gpudeviceplugin.yaml index cdc592446..95f9c7995 100644 --- a/deployments/operator/samples/deviceplugin_v1_gpudeviceplugin.yaml +++ b/deployments/operator/samples/deviceplugin_v1_gpudeviceplugin.yaml @@ -3,8 +3,8 @@ kind: GpuDevicePlugin metadata: name: gpudeviceplugin-sample spec: - image: intel/intel-gpu-plugin:0.20.0 - initImage: intel/intel-gpu-initcontainer:0.20.0 + image: intel/intel-gpu-plugin:0.21.0 + initImage: intel/intel-gpu-initcontainer:0.21.0 sharedDevNum: 10 logLevel: 4 nodeSelector: diff --git a/deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml index 4f6d58501..e1e0de3c3 100644 --- a/deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml +++ b/deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml @@ -3,7 +3,7 @@ kind: QatDevicePlugin metadata: name: qatdeviceplugin-sample spec: - image: intel/intel-qat-plugin:0.20.0 + image: intel/intel-qat-plugin:0.21.0 dpdkDriver: vfio-pci kernelVfDrivers: - c6xxvf diff --git a/deployments/operator/samples/deviceplugin_v1_sgxdeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_sgxdeviceplugin.yaml index bf6a16593..202c8ec02 100644 --- a/deployments/operator/samples/deviceplugin_v1_sgxdeviceplugin.yaml +++ b/deployments/operator/samples/deviceplugin_v1_sgxdeviceplugin.yaml @@ -3,8 +3,8 @@ kind: SgxDevicePlugin metadata: name: sgxdeviceplugin-sample spec: - image: intel/intel-sgx-plugin:0.20.0 - initImage: intel/intel-sgx-initcontainer:0.20.0 + image: intel/intel-sgx-plugin:0.21.0 + initImage: intel/intel-sgx-initcontainer:0.21.0 enclaveLimit: 110 provisionLimit: 110 logLevel: 4 diff --git a/deployments/qat_dpdk_app/base/crypto-perf-dpdk-pod-requesting-qat.yaml b/deployments/qat_dpdk_app/base/crypto-perf-dpdk-pod-requesting-qat.yaml index 8521cbfc7..28674fba3 100644 --- a/deployments/qat_dpdk_app/base/crypto-perf-dpdk-pod-requesting-qat.yaml +++ b/deployments/qat_dpdk_app/base/crypto-perf-dpdk-pod-requesting-qat.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: crypto-perf - image: intel/crypto-perf:devel + image: intel/crypto-perf:0.21.0 imagePullPolicy: IfNotPresent command: [ "/bin/bash", "-c", "--" ] args: [ "while true; do sleep 300000; done;" ] diff --git a/deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml b/deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml index 5b876b1a0..eb921f942 100644 --- a/deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml +++ b/deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml @@ -18,7 +18,7 @@ spec: securityContext: readOnlyRootFilesystem: true privileged: true - image: intel/intel-qat-plugin:devel + image: intel/intel-qat-plugin:0.21.0 imagePullPolicy: IfNotPresent args: ["-mode", "kernel"] volumeMounts: diff --git a/deployments/qat_plugin/base/intel-qat-plugin.yaml b/deployments/qat_plugin/base/intel-qat-plugin.yaml index 6cec9302d..8d1335997 100644 --- a/deployments/qat_plugin/base/intel-qat-plugin.yaml +++ b/deployments/qat_plugin/base/intel-qat-plugin.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: intel-qat-plugin - image: intel/intel-qat-plugin:devel + image: intel/intel-qat-plugin:0.21.0 securityContext: readOnlyRootFilesystem: true env: diff --git a/deployments/sgx_admissionwebhook/manager/manager.yaml b/deployments/sgx_admissionwebhook/manager/manager.yaml index 8079ab98c..8e907512f 100644 --- a/deployments/sgx_admissionwebhook/manager/manager.yaml +++ b/deployments/sgx_admissionwebhook/manager/manager.yaml @@ -16,7 +16,7 @@ spec: control-plane: controller-manager spec: containers: - - image: intel/intel-sgx-admissionwebhook:devel + - image: intel/intel-sgx-admissionwebhook:0.21.0 imagePullPolicy: IfNotPresent name: manager securityContext: diff --git a/deployments/sgx_plugin/base/intel-sgx-plugin.yaml b/deployments/sgx_plugin/base/intel-sgx-plugin.yaml index 448165c67..6eab849f8 100644 --- a/deployments/sgx_plugin/base/intel-sgx-plugin.yaml +++ b/deployments/sgx_plugin/base/intel-sgx-plugin.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: intel-sgx-plugin - image: intel/intel-sgx-plugin:devel + image: intel/intel-sgx-plugin:0.21.0 securityContext: readOnlyRootFilesystem: true imagePullPolicy: IfNotPresent diff --git a/deployments/sgx_plugin/overlays/epc-nfd/add-epc-nfd-initcontainer.yaml b/deployments/sgx_plugin/overlays/epc-nfd/add-epc-nfd-initcontainer.yaml index aa12eaa23..a3950124b 100644 --- a/deployments/sgx_plugin/overlays/epc-nfd/add-epc-nfd-initcontainer.yaml +++ b/deployments/sgx_plugin/overlays/epc-nfd/add-epc-nfd-initcontainer.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: intel-sgx-initcontainer - image: intel/intel-sgx-initcontainer:devel + image: intel/intel-sgx-initcontainer:0.21.0 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true diff --git a/deployments/sgx_plugin/overlays/epc-register/init-daemonset.yaml b/deployments/sgx_plugin/overlays/epc-register/init-daemonset.yaml index e513bc79c..7a87585ee 100644 --- a/deployments/sgx_plugin/overlays/epc-register/init-daemonset.yaml +++ b/deployments/sgx_plugin/overlays/epc-register/init-daemonset.yaml @@ -16,7 +16,7 @@ spec: serviceAccountName: sgx-plugin containers: - name: sgx-node-init - image: intel/intel-sgx-initcontainer:devel + image: intel/intel-sgx-initcontainer:0.21.0 imagePullPolicy: IfNotPresent command: - /usr/local/bin/sgx-sw/intel-sgx-epchook diff --git a/deployments/vpu_plugin/base/intel-vpu-plugin.yaml b/deployments/vpu_plugin/base/intel-vpu-plugin.yaml index ad5fae13a..0eb19eb6c 100644 --- a/deployments/vpu_plugin/base/intel-vpu-plugin.yaml +++ b/deployments/vpu_plugin/base/intel-vpu-plugin.yaml @@ -20,7 +20,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-vpu-plugin:devel + image: intel/intel-vpu-plugin:0.21.0 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true From 175052b333874ee5c16ffe5cc49169d7b0d772c9 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Tue, 15 Jun 2021 20:56:41 +0300 Subject: [PATCH 4/4] docs: create documentation for v0.21 release Signed-off-by: Mikko Ylinen --- .github/workflows/publish.yml | 12 ++++++++++++ README.md | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 94b04b4b1..00676844d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,6 +6,7 @@ on: - main - release-0.19 - release-0.20 + - release-0.21 jobs: build: @@ -60,6 +61,17 @@ jobs: rm -rf _work/venv make vhtml mv _build/html $HOME/output/0.20 + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: release-0.21 + - name: Build release-0.21 + run: | + GITHUB_SHA=$(git rev-parse HEAD) + export GITHUB_SHA + rm -rf _work/venv + make vhtml + mv _build/html $HOME/output/0.21 - name: Deploy the docs shell: bash env: diff --git a/README.md b/README.md index 286148e65..edc8370a2 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ This repository contains a framework for developing plugins for the Kubernetes [device plugins framework](https://kubernetes.io/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/), along with a number of device plugin implementations utilising that framework. -The [v0.20 release](https://github.com/intel/intel-device-plugins-for-kubernetes/releases/latest) -is the latest feature release with its documentation available [here](https://intel.github.io/intel-device-plugins-for-kubernetes/0.20/). +The [v0.21 release](https://github.com/intel/intel-device-plugins-for-kubernetes/releases/latest) +is the latest feature release with its documentation available [here](https://intel.github.io/intel-device-plugins-for-kubernetes/0.21/). Table of Contents @@ -253,6 +253,7 @@ matching Kubernetes versions are listed below: | Branch | Kubernetes branch/version | Status | |:------------------|:-------------------------------|:------------| +| release-0.21 | Kubernetes 1.21 branch v1.21.x | supported | | release-0.20 | Kubernetes 1.20 branch v1.20.x | supported | | release-0.19 | Kubernetes 1.19 branch v1.19.x | supported | | release-0.18 | Kubernetes 1.18 branch v1.18.x | unsupported |