Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand All @@ -71,7 +71,7 @@ clean:

ORG?=intel
REG?=$(ORG)/
TAG?=devel
TAG?=0.17.0
export TAG

pre-pull:
Expand Down
4 changes: 2 additions & 2 deletions build/docker/intel-fpga-admissionwebhook.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
4 changes: 2 additions & 2 deletions build/docker/intel-fpga-initcontainer.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
4 changes: 2 additions & 2 deletions build/docker/intel-fpga-plugin.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
4 changes: 2 additions & 2 deletions build/docker/intel-gpu-plugin.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
4 changes: 2 additions & 2 deletions build/docker/intel-qat-plugin.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
6 changes: 3 additions & 3 deletions build/docker/intel-vpu-plugin.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions demo/crypto-perf/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion demo/intelfpga-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions demo/opae-nlb-demo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion demo/test-fpga-region.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/fpga_admissionwebhook/deployment-tpl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deployments/fpga_plugin/fpga_plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deployments/gpu_plugin/base/intel-gpu-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;" ]
Expand Down
2 changes: 1 addition & 1 deletion deployments/qat_plugin/base/intel-qat-kernel-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deployments/qat_plugin/base/intel-qat-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deployments/vpu_plugin/base/intel-vpu-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down