Merge pull request #721 from mythi/PR-2021-049

rojkov · web-flow · commit 5840daf7b205 · 2021-10-01T15:55:38.000+03:00
images: release 0.22.0
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -4,9 +4,9 @@ on:
   push:
     branches:
         - main
-        - release-0.19
         - release-0.20
         - release-0.21
+        - release-0.22
 
 jobs:
   build:
@@ -42,36 +42,36 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-        ref: release-0.19
-    - name: Build release-0.19
+        ref: release-0.20
+    - name: Build release-0.20
       run: |
         GITHUB_SHA=$(git rev-parse HEAD)
         export GITHUB_SHA
         rm -rf _work/venv
         make vhtml
-        mv _build/html $HOME/output/0.19
+        mv _build/html $HOME/output/0.20
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-        ref: release-0.20
-    - name: Build release-0.20
+        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.20
+        mv _build/html $HOME/output/0.21
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-        ref: release-0.21
-    - name: Build release-0.21
+        ref: release-0.22
+    - name: Build release-0.22
       run: |
         GITHUB_SHA=$(git rev-parse HEAD)
         export GITHUB_SHA
         rm -rf _work/venv
         make vhtml
-        mv _build/html $HOME/output/0.21
+        mv _build/html $HOME/output/0.22
     - name: Deploy the docs
       shell: bash
       env:
diff --git a/Makefile b/Makefile
@@ -60,9 +60,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.22.0 docker.io/intel/intel-fpga-admissionwebhook:0.22.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.22.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
@@ -122,7 +122,7 @@ clean:
 
 ORG?=intel
 REG?=$(ORG)/
-TAG?=devel
+TAG?=0.22.0
 export TAG
 
 pre-pull:
diff --git 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.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/).
+The [v0.22 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.22/).
 
 Table of Contents
 
@@ -251,9 +251,10 @@ matching Kubernetes versions are listed below:
 
 | Branch            | Kubernetes branch/version      | Status      |
 |:------------------|:-------------------------------|:------------|
+| release-0.22      | Kubernetes 1.22 branch v1.22.x | supported   |
 | 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.19      | Kubernetes 1.19 branch v1.19.x | unsupported |
 | release-0.18      | Kubernetes 1.18 branch v1.18.x | unsupported |
 | release-0.17      | Kubernetes 1.17 branch v1.17.x | unsupported |
 | release-0.15      | Kubernetes 1.15 branch v1.15.x | unsupported |
diff --git 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:f8ff8a7c78be9f1c05b287375a845df7f844517fa606734e49ad7c421dea446c
 
 FROM ${CLEAR_LINUX_BASE} as builder
 
-ARG CLEAR_LINUX_VERSION=
+ARG CLEAR_LINUX_VERSION="--version=35090"
 
 RUN mkdir /install_root && \
     swupd os-install \
diff --git 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.22.0
           imagePullPolicy: IfNotPresent
           securityContext:
             capabilities:
diff --git 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.22.0
     imagePullPolicy: IfNotPresent
     securityContext:
       capabilities:
diff --git 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.22.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
@@ -20,7 +20,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-        image: intel/intel-dsa-plugin:devel
+        image: intel/intel-dsa-plugin:0.22.0
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true
diff --git a/deployments/dsa_plugin/overlays/dsa_initcontainer/dsa_initcontainer.yaml b/deployments/dsa_plugin/overlays/dsa_initcontainer/dsa_initcontainer.yaml
@@ -7,7 +7,7 @@ spec:
     spec:
       initContainers:
       - name: intel-dsa-initcontainer
-        image: intel/intel-dsa-initcontainer:devel
+        image: intel/intel-dsa-initcontainer:0.22.0
         securityContext:
           privileged: true
         volumeMounts:
diff --git 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.22.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
@@ -21,7 +21,7 @@ spec:
     spec:
       initContainers:
       - name: intel-fpga-initcontainer
-        image: intel/intel-fpga-initcontainer:devel
+        image: intel/intel-fpga-initcontainer:0.22.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.22.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
@@ -15,7 +15,7 @@ spec:
     spec:
       initContainers:
       - name: intel-gpu-initcontainer
-        image: intel/intel-gpu-initcontainer:devel
+        image: intel/intel-gpu-initcontainer:0.22.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.22.0
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true
diff --git 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.22.0
         imagePullPolicy: IfNotPresent
         name: manager
         resources:
diff --git a/deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml b/deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml
@@ -5,7 +5,7 @@ metadata:
     alm-examples: '[]'
     capabilities: Basic Install
     categories: Drivers and plugins
-    containerImage: intel/intel-deviceplugin-operator:0.21.0
+    containerImage: intel/intel-deviceplugin-operator:0.22.0
     createdAt: "2021-08-18"
     description: This One Operator is a Kubernetes custom controller whose goal is to serve the installation and lifecycle management of Intel device plugins for Kubernetes.
     operators.operatorframework.io/builder: operator-sdk-v1.2.0
diff --git 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.21.0
+  image: intel/intel-dsa-plugin:0.22.0
   sharedDevNum: 10
   logLevel: 4
diff --git 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.21.0
-  initImage: intel/intel-fpga-initcontainer:0.21.0
+  image: intel/intel-fpga-plugin:0.22.0
+  initImage: intel/intel-fpga-initcontainer:0.22.0
   mode: region
   logLevel: 4
   nodeSelector:
diff --git 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.21.0
-  initImage: intel/intel-gpu-initcontainer:0.21.0
+  image: intel/intel-gpu-plugin:0.22.0
+  initImage: intel/intel-gpu-initcontainer:0.22.0
   sharedDevNum: 10
   logLevel: 4
   nodeSelector:
diff --git a/deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml
@@ -9,7 +9,7 @@ metadata:
   # annotations:
   #   container.apparmor.security.beta.kubernetes.io/intel-qat-plugin: unconfined
 spec:
-  image: intel/intel-qat-plugin:0.21.0
+  image: intel/intel-qat-plugin:0.22.0
   dpdkDriver: vfio-pci
   kernelVfDrivers:
     - c6xxvf
diff --git 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.21.0
-  initImage: intel/intel-sgx-initcontainer:0.21.0
+  image: intel/intel-sgx-plugin:0.22.0
+  initImage: intel/intel-sgx-initcontainer:0.22.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
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: crypto-perf
-    image: intel/crypto-perf:devel
+    image: intel/crypto-perf:0.22.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
@@ -18,7 +18,7 @@ spec:
         securityContext:
           readOnlyRootFilesystem: true
           privileged: true
-        image: intel/intel-qat-plugin:devel
+        image: intel/intel-qat-plugin:0.22.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
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: intel-qat-plugin
-        image: intel/intel-qat-plugin:devel
+        image: intel/intel-qat-plugin:0.22.0
         securityContext:
           readOnlyRootFilesystem: true
         env:
diff --git 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.22.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
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: intel-sgx-plugin
-        image: intel/intel-sgx-plugin:devel
+        image: intel/intel-sgx-plugin:0.22.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
@@ -7,7 +7,7 @@ spec:
     spec:
       initContainers:
       - name: intel-sgx-initcontainer
-        image: intel/intel-sgx-initcontainer:devel
+        image: intel/intel-sgx-initcontainer:0.22.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
@@ -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.22.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
@@ -20,7 +20,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-        image: intel/intel-vpu-plugin:devel
+        image: intel/intel-vpu-plugin:0.22.0
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true
diff --git a/pkg/apis/deviceplugin/v1/webhook_common.go b/pkg/apis/deviceplugin/v1/webhook_common.go
@@ -23,7 +23,7 @@ import (
 )
 
 // common constants for webhooks.
-const imageMinVersion string = "0.21.0"
+const imageMinVersion string = "0.22.0"
 
 // common functions for webhooks
 
