diff --git a/Makefile b/Makefile index b75552af4..2cba18168 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ clean: ORG?=intel REG?=$(ORG)/ -TAG?=0.31.0 +TAG?=0.31.1 export TAG ifeq ($(E2E_LEVEL), $(filter $(E2E_LEVEL), full)) diff --git a/README.md b/README.md index 5a2d1b6d0..0e853a2e3 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ 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 utilizing that framework. -The [v0.31 release](https://github.com/intel/intel-device-plugins-for-kubernetes/releases/latest) +The [v0.31.1 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.31/). Table of Contents diff --git a/build/docker/intel-deviceplugin-operator.Dockerfile b/build/docker/intel-deviceplugin-operator.Dockerfile index 67b8e634d..4be2e9f4f 100644 --- a/build/docker/intel-deviceplugin-operator.Dockerfile +++ b/build/docker/intel-deviceplugin-operator.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_deviceplugin_operator"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-deviceplugin-operator' LABEL summary='Intel® device plugin operator for Kubernetes' diff --git a/build/docker/intel-dlb-initcontainer.Dockerfile b/build/docker/intel-dlb-initcontainer.Dockerfile index 173051d38..044d7e68f 100644 --- a/build/docker/intel-dlb-initcontainer.Dockerfile +++ b/build/docker/intel-dlb-initcontainer.Dockerfile @@ -57,7 +57,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION ### FROM ${FINAL_BASE} LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' COPY --from=builder /install_root / COPY demo/dlb-init.sh /usr/local/bin/ diff --git a/build/docker/intel-dlb-plugin.Dockerfile b/build/docker/intel-dlb-plugin.Dockerfile index 517a842e5..988c890fe 100644 --- a/build/docker/intel-dlb-plugin.Dockerfile +++ b/build/docker/intel-dlb-plugin.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_dlb_device_plugin"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-dlb-plugin' LABEL summary='Intel® DLB device plugin for Kubernetes' diff --git a/build/docker/intel-dsa-plugin.Dockerfile b/build/docker/intel-dsa-plugin.Dockerfile index b7a79b177..178f1950c 100644 --- a/build/docker/intel-dsa-plugin.Dockerfile +++ b/build/docker/intel-dsa-plugin.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_dsa_device_plugin"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-dsa-plugin' LABEL summary='Intel® DSA device plugin for Kubernetes' diff --git a/build/docker/intel-fpga-admissionwebhook.Dockerfile b/build/docker/intel-fpga-admissionwebhook.Dockerfile index 9fb0aa801..67ae6b427 100644 --- a/build/docker/intel-fpga-admissionwebhook.Dockerfile +++ b/build/docker/intel-fpga-admissionwebhook.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_fpga_admissionwebhook"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-fpga-admissionwebhook' LABEL summary='Intel® FPGA admission controller webhook for Kubernetes' diff --git a/build/docker/intel-fpga-initcontainer.Dockerfile b/build/docker/intel-fpga-initcontainer.Dockerfile index cf3b6e529..f31eb0d46 100644 --- a/build/docker/intel-fpga-initcontainer.Dockerfile +++ b/build/docker/intel-fpga-initcontainer.Dockerfile @@ -83,7 +83,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION ### FROM ${FINAL_BASE} LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-fpga-initcontainer' LABEL summary='Intel® FPGA programming CDI hook for Kubernetes' diff --git a/build/docker/intel-fpga-plugin.Dockerfile b/build/docker/intel-fpga-plugin.Dockerfile index 9aa4c293b..1e206db8d 100644 --- a/build/docker/intel-fpga-plugin.Dockerfile +++ b/build/docker/intel-fpga-plugin.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_fpga_device_plugin"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-fpga-plugin' LABEL summary='Intel® FPGA device plugin for Kubernetes' diff --git a/build/docker/intel-gpu-fakedev.Dockerfile b/build/docker/intel-gpu-fakedev.Dockerfile index 34f562e99..1f44bc895 100644 --- a/build/docker/intel-gpu-fakedev.Dockerfile +++ b/build/docker/intel-gpu-fakedev.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_gpu_fakedev"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-gpu-fakedev' LABEL summary='Fake device file generator for Intel® GPU plugin' diff --git a/build/docker/intel-gpu-initcontainer.Dockerfile b/build/docker/intel-gpu-initcontainer.Dockerfile index e136a6779..64a08159f 100644 --- a/build/docker/intel-gpu-initcontainer.Dockerfile +++ b/build/docker/intel-gpu-initcontainer.Dockerfile @@ -73,7 +73,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION ### FROM ${FINAL_BASE} LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-gpu-initcontainer' LABEL summary='Intel® GPU NFD hook for Kubernetes' diff --git a/build/docker/intel-gpu-levelzero.Dockerfile b/build/docker/intel-gpu-levelzero.Dockerfile index 9ecfccbb0..e6a9dd593 100644 --- a/build/docker/intel-gpu-levelzero.Dockerfile +++ b/build/docker/intel-gpu-levelzero.Dockerfile @@ -84,7 +84,7 @@ RUN if [ $ROCKYLINUX -eq 0 ]; then \ COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_gpu_levelzero"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-gpu-levelzero' LABEL summary='Intel® GPU levelzero for Kubernetes' diff --git a/build/docker/intel-gpu-plugin.Dockerfile b/build/docker/intel-gpu-plugin.Dockerfile index adad66031..5199d79c8 100644 --- a/build/docker/intel-gpu-plugin.Dockerfile +++ b/build/docker/intel-gpu-plugin.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_gpu_device_plugin"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-gpu-plugin' LABEL summary='Intel® GPU device plugin for Kubernetes' diff --git a/build/docker/intel-iaa-plugin.Dockerfile b/build/docker/intel-iaa-plugin.Dockerfile index 442a98f7a..d60a4fbc9 100644 --- a/build/docker/intel-iaa-plugin.Dockerfile +++ b/build/docker/intel-iaa-plugin.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_iaa_device_plugin"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-iaa-plugin' LABEL summary='Intel® IAA device plugin for Kubernetes' diff --git a/build/docker/intel-qat-initcontainer.Dockerfile b/build/docker/intel-qat-initcontainer.Dockerfile index b4093f693..bf8baca51 100644 --- a/build/docker/intel-qat-initcontainer.Dockerfile +++ b/build/docker/intel-qat-initcontainer.Dockerfile @@ -57,7 +57,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION ### FROM ${FINAL_BASE} LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-qat-initcontainer' LABEL summary='Intel® QAT initcontainer for Kubernetes' diff --git a/build/docker/intel-qat-plugin-kerneldrv.Dockerfile b/build/docker/intel-qat-plugin-kerneldrv.Dockerfile index 8212f064a..14f6a3edf 100644 --- a/build/docker/intel-qat-plugin-kerneldrv.Dockerfile +++ b/build/docker/intel-qat-plugin-kerneldrv.Dockerfile @@ -60,7 +60,7 @@ RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-ku else mkdir -p /install_root/licenses/$CMD/go-licenses/ && cd licenses/$CMD && cp -r * /install_root/licenses/$CMD/go-licenses/ ; fi FROM debian:unstable-slim LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-qat-plugin-kerneldrv' LABEL summary='Intel® QAT device plugin kerneldrv for Kubernetes' diff --git a/build/docker/intel-qat-plugin.Dockerfile b/build/docker/intel-qat-plugin.Dockerfile index 3fac21e05..1c71820a0 100644 --- a/build/docker/intel-qat-plugin.Dockerfile +++ b/build/docker/intel-qat-plugin.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_qat_device_plugin"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-qat-plugin' LABEL summary='Intel® QAT device plugin for Kubernetes' diff --git a/build/docker/intel-sgx-admissionwebhook.Dockerfile b/build/docker/intel-sgx-admissionwebhook.Dockerfile index 09e262240..2b53f32af 100644 --- a/build/docker/intel-sgx-admissionwebhook.Dockerfile +++ b/build/docker/intel-sgx-admissionwebhook.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_sgx_admissionwebhook"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-sgx-admissionwebhook' LABEL summary='Intel® SGX admission controller webhook for Kubernetes' diff --git a/build/docker/intel-sgx-initcontainer.Dockerfile b/build/docker/intel-sgx-initcontainer.Dockerfile index dc3ed8589..b88f8284a 100644 --- a/build/docker/intel-sgx-initcontainer.Dockerfile +++ b/build/docker/intel-sgx-initcontainer.Dockerfile @@ -73,7 +73,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION ### FROM ${FINAL_BASE} LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-sgx-initcontainer' LABEL summary='Intel® SGX NFD hook for Kubernetes' diff --git a/build/docker/intel-sgx-plugin.Dockerfile b/build/docker/intel-sgx-plugin.Dockerfile index 0dfeb4e9c..464ce878e 100644 --- a/build/docker/intel-sgx-plugin.Dockerfile +++ b/build/docker/intel-sgx-plugin.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_sgx_device_plugin"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-sgx-plugin' LABEL summary='Intel® SGX device plugin for Kubernetes' diff --git a/build/docker/intel-xpumanager-sidecar.Dockerfile b/build/docker/intel-xpumanager-sidecar.Dockerfile index 1495e219e..79a89f609 100644 --- a/build/docker/intel-xpumanager-sidecar.Dockerfile +++ b/build/docker/intel-xpumanager-sidecar.Dockerfile @@ -59,7 +59,7 @@ FROM ${FINAL_BASE} COPY --from=builder /install_root / ENTRYPOINT ["/usr/local/bin/intel_xpumanager_sidecar"] LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' LABEL name='intel-xpumanager-sidecar' LABEL summary='Intel® xpumanager sidecar' diff --git a/build/docker/lib/default_labels.docker b/build/docker/lib/default_labels.docker index ea0c6ba34..b11817b2a 100644 --- a/build/docker/lib/default_labels.docker +++ b/build/docker/lib/default_labels.docker @@ -1,3 +1,3 @@ LABEL vendor='Intel®' -LABEL version='0.31.0' +LABEL version='0.31.1' LABEL release='1' diff --git a/cmd/internal/labeler/labeler_test.go b/cmd/internal/labeler/labeler_test.go index deca2df78..f1e71e8bd 100644 --- a/cmd/internal/labeler/labeler_test.go +++ b/cmd/internal/labeler/labeler_test.go @@ -773,7 +773,11 @@ func TestCreateAndRun(t *testing.T) { // Wait for the labeling timeout to trigger if !waitForFileOp(root, nfdLabelBase, fsnotify.Remove, time.Second*2) { - t.Error("Run didn't remove label file") + // It's possible that removal happened before we started waiting. + // Only fail the test if the file still exists. + if _, err := os.Stat(nfdLabelFile); err == nil { + t.Error("Run didn't remove label file") + } } }) } diff --git a/demo/dlb-libdlb-demo-pf-pod.yaml b/demo/dlb-libdlb-demo-pf-pod.yaml index 54e215ad7..5ee27ba4e 100644 --- a/demo/dlb-libdlb-demo-pf-pod.yaml +++ b/demo/dlb-libdlb-demo-pf-pod.yaml @@ -6,7 +6,7 @@ spec: restartPolicy: Never containers: - name: dlb-libdlb-demo-pf-pod - image: intel/dlb-libdlb-demo:0.31.0 + image: intel/dlb-libdlb-demo:0.31.1 imagePullPolicy: IfNotPresent resources: limits: diff --git a/demo/dlb-libdlb-demo-pod.yaml b/demo/dlb-libdlb-demo-pod.yaml index a0ee95924..4697a8cc1 100644 --- a/demo/dlb-libdlb-demo-pod.yaml +++ b/demo/dlb-libdlb-demo-pod.yaml @@ -6,7 +6,7 @@ spec: restartPolicy: Never containers: - name: pf - image: intel/dlb-libdlb-demo:0.31.0 + image: intel/dlb-libdlb-demo:0.31.1 imagePullPolicy: IfNotPresent resources: limits: @@ -18,7 +18,7 @@ spec: cpu: 1 memory: 200Mi - name: vf - image: intel/dlb-libdlb-demo:0.31.0 + image: intel/dlb-libdlb-demo:0.31.1 imagePullPolicy: IfNotPresent resources: limits: diff --git a/demo/dlb-libdlb-demo-vf-pod.yaml b/demo/dlb-libdlb-demo-vf-pod.yaml index 6b7c2ba02..37171d61d 100644 --- a/demo/dlb-libdlb-demo-vf-pod.yaml +++ b/demo/dlb-libdlb-demo-vf-pod.yaml @@ -6,7 +6,7 @@ spec: restartPolicy: Never containers: - name: dlb-libdlb-demo-vf-pod - image: intel/dlb-libdlb-demo:0.31.0 + image: intel/dlb-libdlb-demo:0.31.1 command: [ "sh", "-c", "/usr/local/bin/dir_traffic -n 8 -w epoll -d $(ls /dev/dlb* | sed 's/\\/dev\\/dlb//')" ] imagePullPolicy: IfNotPresent resources: diff --git a/demo/dsa-accel-config-demo-pod.yaml b/demo/dsa-accel-config-demo-pod.yaml index cfdfa30bd..5c01a9811 100644 --- a/demo/dsa-accel-config-demo-pod.yaml +++ b/demo/dsa-accel-config-demo-pod.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: dsa-accel-config-demo - image: intel/accel-config-demo:0.31.0 + image: intel/accel-config-demo:0.31.1 imagePullPolicy: IfNotPresent workingDir: "/usr/libexec/accel-config/test/" command: diff --git a/demo/iaa-accel-config-demo-pod.yaml b/demo/iaa-accel-config-demo-pod.yaml index 07afbdd3f..a90b2a706 100644 --- a/demo/iaa-accel-config-demo-pod.yaml +++ b/demo/iaa-accel-config-demo-pod.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: iaa-accel-config-demo - image: intel/accel-config-demo:0.31.0 + image: intel/accel-config-demo:0.31.1 workingDir: "/usr/libexec/accel-config/test/" command: - "./iaa_user_test_runner.sh" diff --git a/demo/intelfpga-job.yaml b/demo/intelfpga-job.yaml index ae3b82bee..29fc5cd5d 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:0.31.0 + image: intel/opae-nlb-demo:0.31.1 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/demo/test-fpga-orchestrated.yaml b/demo/test-fpga-orchestrated.yaml index 93cb31e9a..163bcd2cd 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:0.31.0 + image: intel/opae-nlb-demo:0.31.1 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/demo/test-fpga-preprogrammed.yaml b/demo/test-fpga-preprogrammed.yaml index 6dc6a3c50..0607c0aa1 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:0.31.0 + image: intel/opae-nlb-demo:0.31.1 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/deployments/dlb_plugin/base/intel-dlb-plugin.yaml b/deployments/dlb_plugin/base/intel-dlb-plugin.yaml index ba242621c..b9511b5c9 100644 --- a/deployments/dlb_plugin/base/intel-dlb-plugin.yaml +++ b/deployments/dlb_plugin/base/intel-dlb-plugin.yaml @@ -26,7 +26,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-dlb-plugin:0.31.0 + image: intel/intel-dlb-plugin:0.31.1 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true diff --git a/deployments/dlb_plugin/overlays/dlb_initcontainer/dlb_initcontainer.yaml b/deployments/dlb_plugin/overlays/dlb_initcontainer/dlb_initcontainer.yaml index 389504a41..7362487ae 100644 --- a/deployments/dlb_plugin/overlays/dlb_initcontainer/dlb_initcontainer.yaml +++ b/deployments/dlb_plugin/overlays/dlb_initcontainer/dlb_initcontainer.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: intel-dlb-initcontainer - image: intel/intel-dlb-initcontainer:0.31.0 + image: intel/intel-dlb-initcontainer:0.31.1 securityContext: readOnlyRootFilesystem: true privileged: true diff --git a/deployments/dsa_plugin/base/intel-dsa-plugin.yaml b/deployments/dsa_plugin/base/intel-dsa-plugin.yaml index 15ec658b2..c4a363286 100644 --- a/deployments/dsa_plugin/base/intel-dsa-plugin.yaml +++ b/deployments/dsa_plugin/base/intel-dsa-plugin.yaml @@ -26,7 +26,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-dsa-plugin:0.31.0 + image: intel/intel-dsa-plugin:0.31.1 imagePullPolicy: IfNotPresent securityContext: seLinuxOptions: diff --git a/deployments/dsa_plugin/overlays/dsa_initcontainer/dsa_initcontainer.yaml b/deployments/dsa_plugin/overlays/dsa_initcontainer/dsa_initcontainer.yaml index 992d61eaf..4304171d6 100644 --- a/deployments/dsa_plugin/overlays/dsa_initcontainer/dsa_initcontainer.yaml +++ b/deployments/dsa_plugin/overlays/dsa_initcontainer/dsa_initcontainer.yaml @@ -12,7 +12,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-idxd-config-initcontainer:0.31.0 + image: intel/intel-idxd-config-initcontainer:0.31.1 securityContext: seLinuxOptions: type: "container_device_plugin_init_t" diff --git a/deployments/fpga_admissionwebhook/manager/manager.yaml b/deployments/fpga_admissionwebhook/manager/manager.yaml index d5c7b499f..6e513e21a 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:0.31.0 + - image: intel/intel-fpga-admissionwebhook:0.31.1 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 c923fcedb..5e86c58d6 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:0.31.0 + image: intel/intel-fpga-initcontainer:0.31.1 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true @@ -36,7 +36,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-fpga-plugin:0.31.0 + image: intel/intel-fpga-plugin:0.31.1 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 03d8ecc54..4e439383b 100644 --- a/deployments/gpu_plugin/base/intel-gpu-plugin.yaml +++ b/deployments/gpu_plugin/base/intel-gpu-plugin.yaml @@ -29,7 +29,7 @@ spec: valueFrom: fieldRef: fieldPath: status.hostIP - image: intel/intel-gpu-plugin:0.31.0 + image: intel/intel-gpu-plugin:0.31.1 imagePullPolicy: IfNotPresent securityContext: seLinuxOptions: diff --git a/deployments/gpu_plugin/overlays/levelzero/levelzero.yaml b/deployments/gpu_plugin/overlays/levelzero/levelzero.yaml index df1f620dc..bc530392d 100644 --- a/deployments/gpu_plugin/overlays/levelzero/levelzero.yaml +++ b/deployments/gpu_plugin/overlays/levelzero/levelzero.yaml @@ -2,7 +2,7 @@ path: /spec/template/spec/containers/- value: name: intel-gpu-levelzero - image: intel/intel-gpu-levelzero:0.31.0 + image: intel/intel-gpu-levelzero:0.31.1 imagePullPolicy: IfNotPresent args: - "-v=2" diff --git a/deployments/iaa_plugin/base/intel-iaa-plugin.yaml b/deployments/iaa_plugin/base/intel-iaa-plugin.yaml index 1e623dcc6..dcdd33018 100644 --- a/deployments/iaa_plugin/base/intel-iaa-plugin.yaml +++ b/deployments/iaa_plugin/base/intel-iaa-plugin.yaml @@ -26,7 +26,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-iaa-plugin:0.31.0 + image: intel/intel-iaa-plugin:0.31.1 imagePullPolicy: IfNotPresent securityContext: seLinuxOptions: diff --git a/deployments/iaa_plugin/overlays/iaa_initcontainer/iaa_initcontainer.yaml b/deployments/iaa_plugin/overlays/iaa_initcontainer/iaa_initcontainer.yaml index 8957b7027..6edd289ed 100644 --- a/deployments/iaa_plugin/overlays/iaa_initcontainer/iaa_initcontainer.yaml +++ b/deployments/iaa_plugin/overlays/iaa_initcontainer/iaa_initcontainer.yaml @@ -14,7 +14,7 @@ spec: fieldPath: spec.nodeName - name: DEVICE_TYPE value: "iaa" - image: intel/intel-idxd-config-initcontainer:0.31.0 + image: intel/intel-idxd-config-initcontainer:0.31.1 securityContext: seLinuxOptions: type: "container_device_plugin_init_t" diff --git a/deployments/operator/manager/manager.yaml b/deployments/operator/manager/manager.yaml index babb9f717..7b0d39795 100644 --- a/deployments/operator/manager/manager.yaml +++ b/deployments/operator/manager/manager.yaml @@ -27,7 +27,7 @@ spec: manager: intel-deviceplugin-operator spec: containers: - - image: docker.io/intel/intel-deviceplugin-operator:0.31.0 + - image: docker.io/intel/intel-deviceplugin-operator:0.31.1 imagePullPolicy: IfNotPresent name: manager livenessProbe: diff --git a/deployments/operator/samples/deviceplugin_v1_dlbdeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_dlbdeviceplugin.yaml index 589c05304..8ece03983 100644 --- a/deployments/operator/samples/deviceplugin_v1_dlbdeviceplugin.yaml +++ b/deployments/operator/samples/deviceplugin_v1_dlbdeviceplugin.yaml @@ -9,8 +9,8 @@ metadata: # annotations: # container.apparmor.security.beta.kubernetes.io/intel-dlb-plugin: unconfined spec: - image: intel/intel-dlb-plugin:0.31.0 - initImage: intel/intel-dlb-initcontainer:0.31.0 + image: intel/intel-dlb-plugin:0.31.1 + initImage: intel/intel-dlb-initcontainer:0.31.1 logLevel: 4 nodeSelector: intel.feature.node.kubernetes.io/dlb: 'true' diff --git a/deployments/operator/samples/deviceplugin_v1_dsadeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_dsadeviceplugin.yaml index c43bba864..24b3375f4 100644 --- a/deployments/operator/samples/deviceplugin_v1_dsadeviceplugin.yaml +++ b/deployments/operator/samples/deviceplugin_v1_dsadeviceplugin.yaml @@ -3,8 +3,8 @@ kind: DsaDevicePlugin metadata: name: dsadeviceplugin-sample spec: - image: intel/intel-dsa-plugin:0.31.0 - initImage: intel/intel-idxd-config-initcontainer:0.31.0 + image: intel/intel-dsa-plugin:0.31.1 + initImage: intel/intel-idxd-config-initcontainer:0.31.1 sharedDevNum: 10 logLevel: 4 nodeSelector: diff --git a/deployments/operator/samples/deviceplugin_v1_fpgadeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_fpgadeviceplugin.yaml index 55de4b1d3..350a8a9bf 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.31.0 - initImage: intel/intel-fpga-initcontainer:0.31.0 + image: intel/intel-fpga-plugin:0.31.1 + initImage: intel/intel-fpga-initcontainer:0.31.1 mode: region logLevel: 4 nodeSelector: diff --git a/deployments/operator/samples/deviceplugin_v1_gpudeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_gpudeviceplugin.yaml index 6a8d6c089..aabbce6f9 100644 --- a/deployments/operator/samples/deviceplugin_v1_gpudeviceplugin.yaml +++ b/deployments/operator/samples/deviceplugin_v1_gpudeviceplugin.yaml @@ -3,7 +3,7 @@ kind: GpuDevicePlugin metadata: name: gpudeviceplugin-sample spec: - image: intel/intel-gpu-plugin:0.31.0 + image: intel/intel-gpu-plugin:0.31.1 sharedDevNum: 10 logLevel: 4 enableMonitoring: true diff --git a/deployments/operator/samples/deviceplugin_v1_iaadeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_iaadeviceplugin.yaml index c6f0bd4fc..4f0aedf49 100644 --- a/deployments/operator/samples/deviceplugin_v1_iaadeviceplugin.yaml +++ b/deployments/operator/samples/deviceplugin_v1_iaadeviceplugin.yaml @@ -3,8 +3,8 @@ kind: IaaDevicePlugin metadata: name: iaadeviceplugin-sample spec: - image: intel/intel-iaa-plugin:0.31.0 - initImage: intel/intel-idxd-config-initcontainer:0.31.0 + image: intel/intel-iaa-plugin:0.31.1 + initImage: intel/intel-idxd-config-initcontainer:0.31.1 sharedDevNum: 10 logLevel: 4 nodeSelector: diff --git a/deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml index 82a67c1f1..0959a5b3d 100644 --- a/deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml +++ b/deployments/operator/samples/deviceplugin_v1_qatdeviceplugin.yaml @@ -9,8 +9,8 @@ metadata: # annotations: # container.apparmor.security.beta.kubernetes.io/intel-qat-plugin: unconfined spec: - image: intel/intel-qat-plugin:0.31.0 - initImage: intel/intel-qat-initcontainer:0.31.0 + image: intel/intel-qat-plugin:0.31.1 + initImage: intel/intel-qat-initcontainer:0.31.1 dpdkDriver: vfio-pci kernelVfDrivers: - 4xxxvf diff --git a/deployments/operator/samples/deviceplugin_v1_sgxdeviceplugin.yaml b/deployments/operator/samples/deviceplugin_v1_sgxdeviceplugin.yaml index 6fbdf453d..8870046e1 100644 --- a/deployments/operator/samples/deviceplugin_v1_sgxdeviceplugin.yaml +++ b/deployments/operator/samples/deviceplugin_v1_sgxdeviceplugin.yaml @@ -3,7 +3,7 @@ kind: SgxDevicePlugin metadata: name: sgxdeviceplugin-sample spec: - image: intel/intel-sgx-plugin:0.31.0 + image: intel/intel-sgx-plugin:0.31.1 enclaveLimit: 110 provisionLimit: 110 logLevel: 4 diff --git a/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-dc.yaml b/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-dc.yaml index 6085b7cad..555cfeb72 100644 --- a/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-dc.yaml +++ b/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-dc.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: compress-perf - image: intel/crypto-perf:0.31.0 + image: intel/crypto-perf:0.31.1 imagePullPolicy: IfNotPresent env: - name: TESTCMD diff --git a/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-generic.yaml b/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-generic.yaml index 6085b7cad..555cfeb72 100644 --- a/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-generic.yaml +++ b/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-generic.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: compress-perf - image: intel/crypto-perf:0.31.0 + image: intel/crypto-perf:0.31.1 imagePullPolicy: IfNotPresent env: - name: TESTCMD diff --git a/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-cy.yaml b/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-cy.yaml index 035c5af4e..5500d2f71 100644 --- a/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-cy.yaml +++ b/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-cy.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: crypto-perf - image: intel/crypto-perf:0.31.0 + image: intel/crypto-perf:0.31.1 imagePullPolicy: IfNotPresent env: - name: TESTCMD diff --git a/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-generic.yaml b/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-generic.yaml index 1aa6f2220..ea92ad809 100644 --- a/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-generic.yaml +++ b/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-generic.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: crypto-perf - image: intel/crypto-perf:0.31.0 + image: intel/crypto-perf:0.31.1 imagePullPolicy: IfNotPresent env: - name: TESTCMD diff --git a/deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml b/deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml index 90cc038b9..ad8e3580b 100644 --- a/deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml +++ b/deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml @@ -24,7 +24,7 @@ spec: readOnlyRootFilesystem: true allowPrivilegeEscalation: false privileged: true - image: intel/intel-qat-plugin:0.31.0 + image: intel/intel-qat-plugin:0.31.1 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 817175c10..a09ca2af2 100644 --- a/deployments/qat_plugin/base/intel-qat-plugin.yaml +++ b/deployments/qat_plugin/base/intel-qat-plugin.yaml @@ -30,7 +30,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-qat-plugin:0.31.0 + image: intel/intel-qat-plugin:0.31.1 securityContext: seLinuxOptions: type: "container_device_plugin_t" diff --git a/deployments/qat_plugin/overlays/qat_initcontainer/qat_initcontainer.yaml b/deployments/qat_plugin/overlays/qat_initcontainer/qat_initcontainer.yaml index 7207fbca2..869d003d9 100644 --- a/deployments/qat_plugin/overlays/qat_initcontainer/qat_initcontainer.yaml +++ b/deployments/qat_plugin/overlays/qat_initcontainer/qat_initcontainer.yaml @@ -12,7 +12,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-qat-initcontainer:0.31.0 + image: intel/intel-qat-initcontainer:0.31.1 securityContext: readOnlyRootFilesystem: true privileged: true diff --git a/deployments/sgx_admissionwebhook/manager/manager.yaml b/deployments/sgx_admissionwebhook/manager/manager.yaml index 30a6b8dd0..3f9f30c16 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:0.31.0 + - image: intel/intel-sgx-admissionwebhook:0.31.1 imagePullPolicy: IfNotPresent name: manager securityContext: diff --git a/deployments/sgx_enclave_apps/base/intelsgx-job.yaml b/deployments/sgx_enclave_apps/base/intelsgx-job.yaml index dd8e2a743..13eeaaac5 100644 --- a/deployments/sgx_enclave_apps/base/intelsgx-job.yaml +++ b/deployments/sgx_enclave_apps/base/intelsgx-job.yaml @@ -14,7 +14,7 @@ spec: containers: - name: intelsgx-demo-job-1 - image: intel/sgx-sdk-demo:0.31.0 + image: intel/sgx-sdk-demo:0.31.1 imagePullPolicy: IfNotPresent workingDir: "/opt/intel/sgx-sample-app/" command: ["/opt/intel/sgx-sample-app/sgx-sample-app"] diff --git a/deployments/sgx_enclave_apps/overlays/sgx_ecdsa_inproc_quote/add_sgx_default_qcnl_conf.yaml b/deployments/sgx_enclave_apps/overlays/sgx_ecdsa_inproc_quote/add_sgx_default_qcnl_conf.yaml index 511c375e6..d93061ab2 100644 --- a/deployments/sgx_enclave_apps/overlays/sgx_ecdsa_inproc_quote/add_sgx_default_qcnl_conf.yaml +++ b/deployments/sgx_enclave_apps/overlays/sgx_ecdsa_inproc_quote/add_sgx_default_qcnl_conf.yaml @@ -7,7 +7,7 @@ spec: spec: containers: - name: intelsgx-demo-job-1 - image: intel/sgx-sdk-demo:0.31.0 + image: intel/sgx-sdk-demo:0.31.1 volumeMounts: - name: qplconf mountPath: /etc/sgx_default_qcnl.conf diff --git a/deployments/sgx_plugin/base/intel-sgx-plugin.yaml b/deployments/sgx_plugin/base/intel-sgx-plugin.yaml index a034569c0..9f8cff932 100644 --- a/deployments/sgx_plugin/base/intel-sgx-plugin.yaml +++ b/deployments/sgx_plugin/base/intel-sgx-plugin.yaml @@ -21,7 +21,7 @@ spec: automountServiceAccountToken: false containers: - name: intel-sgx-plugin - image: intel/intel-sgx-plugin:0.31.0 + image: intel/intel-sgx-plugin:0.31.1 securityContext: seLinuxOptions: type: "container_device_plugin_t" diff --git a/deployments/sgx_plugin/overlays/epc-hook-initcontainer/add-epc-nfd-initcontainer.yaml b/deployments/sgx_plugin/overlays/epc-hook-initcontainer/add-epc-nfd-initcontainer.yaml index 8579c6ba3..25e24c7c6 100644 --- a/deployments/sgx_plugin/overlays/epc-hook-initcontainer/add-epc-nfd-initcontainer.yaml +++ b/deployments/sgx_plugin/overlays/epc-hook-initcontainer/add-epc-nfd-initcontainer.yaml @@ -7,7 +7,7 @@ spec: spec: initContainers: - name: intel-sgx-initcontainer - image: intel/intel-sgx-initcontainer:0.31.0 + image: intel/intel-sgx-initcontainer:0.31.1 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 3a88ff156..c12c437ff 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:0.31.0 + image: intel/intel-sgx-initcontainer:0.31.1 imagePullPolicy: IfNotPresent command: - /usr/local/bin/sgx-sw/intel-sgx-epchook diff --git a/deployments/xpumanager_sidecar/overlays/cert-manager/xpumanager.yaml b/deployments/xpumanager_sidecar/overlays/cert-manager/xpumanager.yaml index d78ded5a6..99aa590c7 100644 --- a/deployments/xpumanager_sidecar/overlays/cert-manager/xpumanager.yaml +++ b/deployments/xpumanager_sidecar/overlays/cert-manager/xpumanager.yaml @@ -41,7 +41,7 @@ spec: httpGet: scheme: HTTPS - name: xelink-sidecar - image: intel/intel-xpumanager-sidecar:0.31.0 + image: intel/intel-xpumanager-sidecar:0.31.1 imagePullPolicy: IfNotPresent args: - -v=2 diff --git a/deployments/xpumanager_sidecar/overlays/http/xpumanager.yaml b/deployments/xpumanager_sidecar/overlays/http/xpumanager.yaml index 92e377fdf..e499ee5e3 100644 --- a/deployments/xpumanager_sidecar/overlays/http/xpumanager.yaml +++ b/deployments/xpumanager_sidecar/overlays/http/xpumanager.yaml @@ -13,7 +13,7 @@ spec: path: "/etc/kubernetes/node-feature-discovery/features.d/" containers: - name: xelink-sidecar - image: intel/intel-xpumanager-sidecar:0.31.0 + image: intel/intel-xpumanager-sidecar:0.31.1 imagePullPolicy: IfNotPresent args: - -v=2 diff --git a/pkg/controllers/fpga/controller_test.go b/pkg/controllers/fpga/controller_test.go index ecf270df9..a623a5bc5 100644 --- a/pkg/controllers/fpga/controller_test.go +++ b/pkg/controllers/fpga/controller_test.go @@ -202,7 +202,7 @@ func TestNewDaemonSetFPGA(t *testing.T) { plugin := &devicepluginv1.FpgaDevicePlugin{ Spec: devicepluginv1.FpgaDevicePluginSpec{ - InitImage: "intel/intel-fpga-initcontainer:0.31.0", + InitImage: "intel/intel-fpga-initcontainer:0.31.1", }, } plugin.Name = "testing" diff --git a/pkg/controllers/reconciler.go b/pkg/controllers/reconciler.go index d1c38d3c6..1791b9c21 100644 --- a/pkg/controllers/reconciler.go +++ b/pkg/controllers/reconciler.go @@ -38,7 +38,7 @@ import ( ) var ( - ImageMinVersion = versionutil.MustParseSemantic("0.31.0") + ImageMinVersion = versionutil.MustParseSemantic("0.31.1") ) const ( @@ -158,10 +158,13 @@ func UpgradeImages(ctx context.Context, image *string, initimage *string) (upgra if s == nil { continue } - + // e.g. intel-dsa-plugin@sha256:hash -> [intel-dsa-plugin@sha256, hash] if parts := strings.SplitN(*s, ":", 2); len(parts) == 2 && len(parts[0]) > 0 { - name, version := parts[0], parts[1] + // e.g. [intel-dsa-plugin@sha256, hash] -> [intel-dsa-plugin, hash] + name, version := strings.TrimSuffix(parts[0], "@sha256"), parts[1] + // e.g. intel-dsa-plugin -> INTEL_DSA_PLUGIN_SHA + // and get the value of the env var INTEL_DSA_PLUGIN_SHA envVarValue := os.Getenv(strings.ReplaceAll(strings.ToUpper(filepath.Base(name)), "-", "_") + "_SHA") if envVarValue != "" && *s != envVarValue { diff --git a/pkg/controllers/reconciler_test.go b/pkg/controllers/reconciler_test.go index c2ff136b9..7dc176634 100644 --- a/pkg/controllers/reconciler_test.go +++ b/pkg/controllers/reconciler_test.go @@ -16,6 +16,7 @@ package controllers import ( "context" + "os" "testing" v1 "k8s.io/api/core/v1" @@ -27,6 +28,7 @@ func TestUpgrade(test *testing.T) { version := ":" + ImageMinVersion.String() prevVersion := ":" + ImageMinVersion.WithMinor(ImageMinVersion.Minor()-1).String() tests := []struct { + envVars map[string]string image string initimage string expectedImage string @@ -61,11 +63,37 @@ func TestUpgrade(test *testing.T) { expectedInitimage: initimage, upgrade: false, }, + { + envVars: map[string]string{ + "INTEL_DSA_PLUGIN_SHA": "intel/intel-dsa-plugin@sha256:000000000000000000000000000000000000000000000000000000000000000b", + "INTEL_IDXD_CONFIG_INITCONTAINER_SHA": "intel/intel-idxd-config-initcontainer@sha256:000000000000000000000000000000000000000000000000000000000000000b", + }, + image: image + "@sha256:000000000000000000000000000000000000000000000000000000000000000a", + expectedImage: image + "@sha256:000000000000000000000000000000000000000000000000000000000000000b", + initimage: initimage + "@sha256:000000000000000000000000000000000000000000000000000000000000000a", + expectedInitimage: initimage + "@sha256:000000000000000000000000000000000000000000000000000000000000000b", + upgrade: true, + }, + { + envVars: map[string]string{ + "INTEL_DSA_PLUGIN_SHA": "intel/intel-dsa-plugin@sha256:000000000000000000000000000000000000000000000000000000000000000a", + "INTEL_IDXD_CONFIG_INITCONTAINER_SHA": "intel/intel-idxd-config-initcontainer@sha256:000000000000000000000000000000000000000000000000000000000000000a", + }, + image: image + "@sha256:000000000000000000000000000000000000000000000000000000000000000a", + expectedImage: image + "@sha256:000000000000000000000000000000000000000000000000000000000000000a", + initimage: initimage + "@sha256:000000000000000000000000000000000000000000000000000000000000000a", + expectedInitimage: initimage + "@sha256:000000000000000000000000000000000000000000000000000000000000000a", + upgrade: false, + }, } for i := range tests { t := tests[i] + for key, value := range t.envVars { + os.Setenv(key, value) + } + upgrade := UpgradeImages(context.Background(), &t.image, &t.initimage) if !(upgrade == t.upgrade && t.image == t.expectedImage && t.initimage == t.expectedInitimage) { @@ -73,6 +101,10 @@ func TestUpgrade(test *testing.T) { test.Errorf("expectedImage: %s, received: %s", t.expectedImage, t.image) test.Errorf("expectedInitimage: %s, received: %s", t.expectedInitimage, t.initimage) } + + for key := range t.envVars { + os.Unsetenv(key) + } } } diff --git a/test/e2e/fpga/fpga.go b/test/e2e/fpga/fpga.go index 16c9e6ca7..e92d003b6 100644 --- a/test/e2e/fpga/fpga.go +++ b/test/e2e/fpga/fpga.go @@ -136,7 +136,7 @@ func runDevicePlugin(ctx context.Context, fmw *framework.Framework, pluginKustom func runTestCase(ctx context.Context, fmw *framework.Framework, pluginMode, podResource, cmd1, cmd2 string) { resource := v1.ResourceName(podResource) - image := "intel/opae-nlb-demo:0.31.0" + image := "intel/opae-nlb-demo:0.31.1" ginkgo.By("submitting a pod requesting correct FPGA resources") diff --git a/test/e2e/qat/qatplugin_dpdk.go b/test/e2e/qat/qatplugin_dpdk.go index 188be8823..741cab297 100644 --- a/test/e2e/qat/qatplugin_dpdk.go +++ b/test/e2e/qat/qatplugin_dpdk.go @@ -175,7 +175,7 @@ func runCpaSampleCode(ctx context.Context, f *framework.Framework, runTests int, Containers: []v1.Container{ { Name: "openssl-qat-engine", - Image: "intel/openssl-qat-engine:0.31.0", + Image: "intel/openssl-qat-engine:0.31.1", ImagePullPolicy: "IfNotPresent", Command: []string{"cpa_sample_code", "runTests=" + strconv.Itoa(runTests), "signOfLife=1"}, SecurityContext: &v1.SecurityContext{ diff --git a/test/e2e/sgx/sgx.go b/test/e2e/sgx/sgx.go index 7f744adb8..9a094e575 100644 --- a/test/e2e/sgx/sgx.go +++ b/test/e2e/sgx/sgx.go @@ -100,7 +100,7 @@ func describe() { Containers: []v1.Container{ { Name: "testcontainer", - Image: "intel/sgx-sdk-demo:0.31.0", + Image: "intel/sgx-sdk-demo:0.31.1", WorkingDir: "/opt/intel/sgx-sample-app/", Command: []string{"/opt/intel/sgx-sample-app/sgx-sample-app"}, Resources: v1.ResourceRequirements{