From 69db653a53df7b2a7ae913f99bff2f770d39c277 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Wed, 26 Feb 2020 21:01:51 +0200 Subject: [PATCH 1/2] images: lock Clear Linux version for the release Signed-off-by: Mikko Ylinen --- build/docker/intel-fpga-admissionwebhook.Dockerfile | 4 ++-- build/docker/intel-fpga-initcontainer.Dockerfile | 4 ++-- build/docker/intel-fpga-plugin.Dockerfile | 4 ++-- build/docker/intel-gpu-plugin.Dockerfile | 4 ++-- build/docker/intel-qat-plugin.Dockerfile | 4 ++-- build/docker/intel-vpu-plugin.Dockerfile | 6 +++--- demo/crypto-perf/Dockerfile | 4 ++-- demo/opae-nlb-demo/Dockerfile | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/docker/intel-fpga-admissionwebhook.Dockerfile b/build/docker/intel-fpga-admissionwebhook.Dockerfile index 30b46620e..bb744119f 100644 --- a/build/docker/intel-fpga-admissionwebhook.Dockerfile +++ b/build/docker/intel-fpga-admissionwebhook.Dockerfile @@ -6,11 +6,11 @@ # # This is used on release branches before tagging a stable version. # The master branch defaults to using the latest Clear Linux. -ARG CLEAR_LINUX_BASE=clearlinux/golang:latest +ARG CLEAR_LINUX_BASE=clearlinux/golang@sha256:88c32c98c72dab8f5a0760e48c0121d11ee8a962b13b10b362acaa63879a49cb FROM ${CLEAR_LINUX_BASE} as builder -ARG CLEAR_LINUX_VERSION= +ARG CLEAR_LINUX_VERSION="--version=32510" RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} diff --git a/build/docker/intel-fpga-initcontainer.Dockerfile b/build/docker/intel-fpga-initcontainer.Dockerfile index 4a648b8a4..fff7878a1 100644 --- a/build/docker/intel-fpga-initcontainer.Dockerfile +++ b/build/docker/intel-fpga-initcontainer.Dockerfile @@ -6,11 +6,11 @@ # # This is used on release branches before tagging a stable version. # The master branch defaults to using the latest Clear Linux. -ARG CLEAR_LINUX_BASE=clearlinux/golang:latest +ARG CLEAR_LINUX_BASE=clearlinux/golang@sha256:88c32c98c72dab8f5a0760e48c0121d11ee8a962b13b10b362acaa63879a49cb FROM ${CLEAR_LINUX_BASE} as builder -ARG CLEAR_LINUX_VERSION= +ARG CLEAR_LINUX_VERSION="--version=32510" RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} diff --git a/build/docker/intel-fpga-plugin.Dockerfile b/build/docker/intel-fpga-plugin.Dockerfile index 37e42c1ce..254c21009 100644 --- a/build/docker/intel-fpga-plugin.Dockerfile +++ b/build/docker/intel-fpga-plugin.Dockerfile @@ -6,11 +6,11 @@ # # This is used on release branches before tagging a stable version. # The master branch defaults to using the latest Clear Linux. -ARG CLEAR_LINUX_BASE=clearlinux/golang:latest +ARG CLEAR_LINUX_BASE=clearlinux/golang@sha256:88c32c98c72dab8f5a0760e48c0121d11ee8a962b13b10b362acaa63879a49cb FROM ${CLEAR_LINUX_BASE} as builder -ARG CLEAR_LINUX_VERSION= +ARG CLEAR_LINUX_VERSION="--version=32510" RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} diff --git a/build/docker/intel-gpu-plugin.Dockerfile b/build/docker/intel-gpu-plugin.Dockerfile index 644019e7d..7196a7ec5 100644 --- a/build/docker/intel-gpu-plugin.Dockerfile +++ b/build/docker/intel-gpu-plugin.Dockerfile @@ -6,11 +6,11 @@ # # This is used on release branches before tagging a stable version. # The master branch defaults to using the latest Clear Linux. -ARG CLEAR_LINUX_BASE=clearlinux/golang:latest +ARG CLEAR_LINUX_BASE=clearlinux/golang@sha256:88c32c98c72dab8f5a0760e48c0121d11ee8a962b13b10b362acaa63879a49cb FROM ${CLEAR_LINUX_BASE} as builder -ARG CLEAR_LINUX_VERSION= +ARG CLEAR_LINUX_VERSION="--version=32510" RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} diff --git a/build/docker/intel-qat-plugin.Dockerfile b/build/docker/intel-qat-plugin.Dockerfile index c9ac53a2e..ec4b838bf 100644 --- a/build/docker/intel-qat-plugin.Dockerfile +++ b/build/docker/intel-qat-plugin.Dockerfile @@ -6,11 +6,11 @@ # # This is used on release branches before tagging a stable version. # The master branch defaults to using the latest Clear Linux. -ARG CLEAR_LINUX_BASE=clearlinux/golang:latest +ARG CLEAR_LINUX_BASE=clearlinux/golang@sha256:88c32c98c72dab8f5a0760e48c0121d11ee8a962b13b10b362acaa63879a49cb FROM ${CLEAR_LINUX_BASE} as builder -ARG CLEAR_LINUX_VERSION= +ARG CLEAR_LINUX_VERSION="--version=32510" RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} diff --git a/build/docker/intel-vpu-plugin.Dockerfile b/build/docker/intel-vpu-plugin.Dockerfile index c2d150c72..6aa4380a3 100644 --- a/build/docker/intel-vpu-plugin.Dockerfile +++ b/build/docker/intel-vpu-plugin.Dockerfile @@ -6,11 +6,11 @@ # # This is used on release branches before tagging a stable version. # The master branch defaults to using the latest Clear Linux. -ARG CLEAR_LINUX_BASE=clearlinux/golang:latest +ARG CLEAR_LINUX_BASE=clearlinux/golang@sha256:88c32c98c72dab8f5a0760e48c0121d11ee8a962b13b10b362acaa63879a49cb FROM ${CLEAR_LINUX_BASE} as builder -ARG CLEAR_LINUX_VERSION= +ARG CLEAR_LINUX_VERSION="--version=32510" -RUN swupd update --no-boot-update +RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} RUN swupd bundle-add devpkg-libusb RUN mkdir /install_root \ && swupd os-install \ diff --git a/demo/crypto-perf/Dockerfile b/demo/crypto-perf/Dockerfile index fedf5eb91..7c152ce0b 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 master branch defaults to using the latest Clear Linux. -ARG CLEAR_LINUX_BASE=clearlinux:latest +ARG CLEAR_LINUX_BASE=clearlinux@sha256:29ce14c5df5bb6ef5bbb6f96db701cb3e7f68bb164d85964f763c4fb7058370a FROM ${CLEAR_LINUX_BASE} as builder -ARG CLEAR_LINUX_VERSION= +ARG CLEAR_LINUX_VERSION="--version=32510" RUN mkdir /install_root && \ swupd os-install \ diff --git a/demo/opae-nlb-demo/Dockerfile b/demo/opae-nlb-demo/Dockerfile index 1b1de6063..2a36f4b1c 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 master branch defaults to using the latest Clear Linux. -ARG CLEAR_LINUX_BASE=clearlinux:latest +ARG CLEAR_LINUX_BASE=clearlinux@sha256:29ce14c5df5bb6ef5bbb6f96db701cb3e7f68bb164d85964f763c4fb7058370a FROM ${CLEAR_LINUX_BASE} as builder -ARG CLEAR_LINUX_VERSION= +ARG CLEAR_LINUX_VERSION="--version=32510" RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} && \ swupd bundle-add wget c-basic devpkg-json-c devpkg-util-linux devpkg-hwloc doxygen patch From e5042efa1c8b2fbb8a21f86a776015ab7ecf85a9 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Wed, 26 Feb 2020 21:06:34 +0200 Subject: [PATCH 2/2] images: set 0.17.0 tag for the release Signed-off-by: Mikko Ylinen --- Makefile | 6 +++--- demo/intelfpga-job.yaml | 2 +- demo/test-fpga-region.yaml | 2 +- .../base/intel-fpga-webhook-deployment.yaml | 2 +- deployments/fpga_admissionwebhook/deployment-tpl.yaml | 2 +- .../fpga_plugin/base/intel-fpga-plugin-daemonset.yaml | 4 ++-- deployments/fpga_plugin/fpga_plugin.yaml | 4 ++-- deployments/gpu_plugin/base/intel-gpu-plugin.yaml | 2 +- .../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/vpu_plugin/base/intel-vpu-plugin.yaml | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index d7b5e30ae..17a3cdc9c 100644 --- a/Makefile +++ b/Makefile @@ -46,9 +46,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.17.0 docker.io/intel/intel-fpga-admissionwebhook:0.17.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.17.0 -o $(e2e_tmp_dir)/$(WEBHOOK_IMAGE_FILE) @$(KIND) create cluster --name "intel-device-plugins" --kubeconfig $(e2e_tmp_dir)/kubeconfig --image "kindest/node:v1.17.0" @$(KIND) load image-archive --name "intel-device-plugins" $(e2e_tmp_dir)/$(WEBHOOK_IMAGE_FILE) @$(GO) test -v ./test/e2e -args -kubeconfig $(e2e_tmp_dir)/kubeconfig -kubectl-path $(KUBECTL) -ginkgo.focus "Webhook" || rc=1; \ @@ -71,7 +71,7 @@ clean: ORG?=intel REG?=$(ORG)/ -TAG?=devel +TAG?=0.17.0 export TAG pre-pull: diff --git a/demo/intelfpga-job.yaml b/demo/intelfpga-job.yaml index 883784660..58625450d 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.17.0 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/demo/test-fpga-region.yaml b/demo/test-fpga-region.yaml index c5a24744b..a737945b2 100644 --- a/demo/test-fpga-region.yaml +++ b/demo/test-fpga-region.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: intel/opae-nlb-demo:devel + image: intel/opae-nlb-demo:0.17.0 imagePullPolicy: IfNotPresent securityContext: capabilities: diff --git a/deployments/fpga_admissionwebhook/base/intel-fpga-webhook-deployment.yaml b/deployments/fpga_admissionwebhook/base/intel-fpga-webhook-deployment.yaml index 87ad76a2c..ff7e82afe 100644 --- a/deployments/fpga_admissionwebhook/base/intel-fpga-webhook-deployment.yaml +++ b/deployments/fpga_admissionwebhook/base/intel-fpga-webhook-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: fpga-mutator - image: intel/intel-fpga-admissionwebhook:devel + image: intel/intel-fpga-admissionwebhook:0.17.0 imagePullPolicy: IfNotPresent ports: - containerPort: 8443 diff --git a/deployments/fpga_admissionwebhook/deployment-tpl.yaml b/deployments/fpga_admissionwebhook/deployment-tpl.yaml index 930712e02..b78b81f0c 100644 --- a/deployments/fpga_admissionwebhook/deployment-tpl.yaml +++ b/deployments/fpga_admissionwebhook/deployment-tpl.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: fpga-mutator - image: intel/intel-fpga-admissionwebhook:devel + image: intel/intel-fpga-admissionwebhook:0.17.0 imagePullPolicy: IfNotPresent ports: - containerPort: 8443 diff --git a/deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml b/deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml index f915b9356..ef5749910 100644 --- a/deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml +++ b/deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: intel-fpga-plugin-controller initContainers: - name: intel-fpga-initcontainer - image: intel/intel-fpga-initcontainer:devel + image: intel/intel-fpga-initcontainer:0.17.0 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true @@ -33,7 +33,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-fpga-plugin:devel + image: intel/intel-fpga-plugin:0.17.0 imagePullPolicy: IfNotPresent args: - -mode=af diff --git a/deployments/fpga_plugin/fpga_plugin.yaml b/deployments/fpga_plugin/fpga_plugin.yaml index 9de04246c..1e0c0c8ee 100644 --- a/deployments/fpga_plugin/fpga_plugin.yaml +++ b/deployments/fpga_plugin/fpga_plugin.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: intel-fpga-plugin-controller initContainers: - name: intel-fpga-initcontainer - image: intel/intel-fpga-initcontainer:devel + image: intel/intel-fpga-initcontainer:0.17.0 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true @@ -33,7 +33,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-fpga-plugin:devel + image: intel/intel-fpga-plugin:0.17.0 imagePullPolicy: IfNotPresent terminationMessagePath: /tmp/termination-log securityContext: diff --git a/deployments/gpu_plugin/base/intel-gpu-plugin.yaml b/deployments/gpu_plugin/base/intel-gpu-plugin.yaml index db4c5e9b0..12ab3d1ef 100644 --- a/deployments/gpu_plugin/base/intel-gpu-plugin.yaml +++ b/deployments/gpu_plugin/base/intel-gpu-plugin.yaml @@ -20,7 +20,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: intel/intel-gpu-plugin:devel + image: intel/intel-gpu-plugin:0.17.0 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true 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..fbcad8d8b 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.17.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..68b05655b 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.17.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 e57980624..4d735e7e8 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.17.0 securityContext: readOnlyRootFilesystem: true env: diff --git a/deployments/vpu_plugin/base/intel-vpu-plugin.yaml b/deployments/vpu_plugin/base/intel-vpu-plugin.yaml index 329c1c1c1..6ba09fd7f 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.17.0 imagePullPolicy: IfNotPresent securityContext: readOnlyRootFilesystem: true