Merge pull request #1498 from tkatila/prepare-0.26.2

Prepare 0.26.2 release
This commit is contained in:
Mikko Ylinen 2023-08-09 08:23:59 +03:00 committed by GitHub
commit abd7ba5d4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 160 additions and 145 deletions

2
Jenkinsfile vendored
View File

@ -142,7 +142,7 @@ pipeline {
stage('make test-with-kind') {
steps {
dir(path: "$REPO_DIR") {
sh "make test-with-kind REG=intel/ TAG=0.26.1"
sh "make test-with-kind REG=intel/ TAG=0.26.2"
}
}
}

View File

@ -136,7 +136,7 @@ clean:
ORG?=intel
REG?=$(ORG)/
TAG?=0.26.1
TAG?=0.26.2
export TAG
e2e-fpga:

View File

@ -399,7 +399,9 @@ func getDeviceCapabilities(device string) (string, error) {
}
devicesWithCapabilities := map[string]struct{}{
"4941": {}, // Check QAT Gen4 (4xxx) VF PCI ID only
"4941": {}, // QAT Gen4 (4xxx) VF PCI ID
"4943": {}, // QAT Gen4 (401xx) VF PCI ID
"4945": {}, // QAT Gen4 (402xx) VF PCI ID
}
if _, ok := devicesWithCapabilities[devID]; !ok {

View File

@ -6,7 +6,7 @@ spec:
restartPolicy: Never
containers:
- name: dlb-libdlb-demo-pf-pod
image: intel/dlb-libdlb-demo:0.26.1
image: intel/dlb-libdlb-demo:0.26.2
imagePullPolicy: IfNotPresent
resources:
limits:

View File

@ -6,7 +6,7 @@ spec:
restartPolicy: Never
containers:
- name: pf
image: intel/dlb-libdlb-demo:0.26.1
image: intel/dlb-libdlb-demo:0.26.2
imagePullPolicy: IfNotPresent
resources:
limits:
@ -18,7 +18,7 @@ spec:
cpu: 1
memory: 200Mi
- name: vf
image: intel/dlb-libdlb-demo:0.26.1
image: intel/dlb-libdlb-demo:0.26.2
imagePullPolicy: IfNotPresent
resources:
limits:

View File

@ -6,7 +6,7 @@ spec:
restartPolicy: Never
containers:
- name: dlb-libdlb-demo-vf-pod
image: intel/dlb-libdlb-demo:0.26.1
image: intel/dlb-libdlb-demo:0.26.2
command: [ "sh", "-c", "/usr/local/bin/dir_traffic -n 8 -w epoll -d $(ls /dev/dlb* | sed 's/\\/dev\\/dlb//')" ]
imagePullPolicy: IfNotPresent
resources:

View File

@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: dsa-accel-config-demo
image: intel/accel-config-demo:0.26.1
image: intel/accel-config-demo:0.26.2
imagePullPolicy: IfNotPresent
resources:
limits:

View File

@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: iaa-accel-config-demo
image: intel/accel-config-demo:0.26.1
image: intel/accel-config-demo:0.26.2
command: [ "/bin/bash", "-c", "cd /test && /bin/bash -e ./iaa_user_test_runner.sh" ]
imagePullPolicy: IfNotPresent
resources:

View File

@ -13,7 +13,7 @@ spec:
restartPolicy: Never
containers:
- name: intelfpga-demo-job-1
image: intel/opae-nlb-demo:0.26.1
image: intel/opae-nlb-demo:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
capabilities:

View File

@ -4,13 +4,13 @@ FROM debian:unstable-slim AS builder
RUN apt-get update && apt-get install -y curl python3-dev git gcc g++ make cmake uuid-dev libjson-c-dev libedit-dev libudev-dev
# Download and unpack OPAE tarball
ARG OPAE_RELEASE=2.1.0-1
ARG OPAE_SHA256=0c9f52ff1279ca5e34e64828ddf3a6c001fb2969a6349a966cd9515c1048ea01
ARG OPAE_RELEASE=2.2.0-1
ARG OPAE_SHA256=1f80f73a652b456adee87a260c7ec66fe3cbb35184b7d7b531766fb6bb0295d7
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN mkdir -p /usr/src/opae && \
cd /usr/src/opae && \
curl -fsSL https://github.com/OPAE/opae-sdk/archive/${OPAE_RELEASE}.tar.gz -o opae.tar.gz && \
curl -fsSL https://github.com/OFS/opae-sdk/archive/${OPAE_RELEASE}.tar.gz -o opae.tar.gz && \
echo "$OPAE_SHA256 opae.tar.gz" | sha256sum -c - && \
tar -xzf opae.tar.gz && \
rm -f opae.tar.gz

View File

@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: openssl-qat-engine
image: intel/openssl-qat-engine:0.26.1
image: intel/openssl-qat-engine:0.26.2
imagePullPolicy: IfNotPresent
command: [ "cpa_sample_code", "runTests=4", "signOfLife=1" ]
securityContext:

View File

@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-container
image: intel/opae-nlb-demo:0.26.1
image: intel/opae-nlb-demo:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
capabilities:

View File

@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-container
image: intel/opae-nlb-demo:0.26.1
image: intel/opae-nlb-demo:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
capabilities:

View File

@ -21,7 +21,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: intel/intel-dlb-plugin:0.26.1
image: intel/intel-dlb-plugin:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
readOnlyRootFilesystem: true

View File

@ -7,7 +7,7 @@ spec:
spec:
initContainers:
- name: intel-dlb-initcontainer
image: intel/intel-dlb-initcontainer:0.26.1
image: intel/intel-dlb-initcontainer:0.26.2
securityContext:
readOnlyRootFilesystem: true
privileged: true

View File

@ -21,7 +21,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: intel/intel-dsa-plugin:0.26.1
image: intel/intel-dsa-plugin:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
readOnlyRootFilesystem: true

View File

@ -12,7 +12,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: intel/intel-idxd-config-initcontainer:0.26.1
image: intel/intel-idxd-config-initcontainer:0.26.2
securityContext:
readOnlyRootFilesystem: true
privileged: true

View File

@ -16,7 +16,7 @@ spec:
control-plane: controller-manager
spec:
containers:
- image: intel/intel-fpga-admissionwebhook:0.26.1
- image: intel/intel-fpga-admissionwebhook:0.26.2
imagePullPolicy: IfNotPresent
name: manager
securityContext:

View File

@ -16,7 +16,7 @@ spec:
spec:
initContainers:
- name: intel-fpga-initcontainer
image: intel/intel-fpga-initcontainer:0.26.1
image: intel/intel-fpga-initcontainer:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
readOnlyRootFilesystem: true
@ -33,7 +33,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: intel/intel-fpga-plugin:0.26.1
image: intel/intel-fpga-plugin:0.26.2
imagePullPolicy: IfNotPresent
args:
- -mode=af

View File

@ -15,7 +15,7 @@ spec:
spec:
initContainers:
- name: intel-gpu-initcontainer
image: intel/intel-gpu-initcontainer:0.26.1
image: intel/intel-gpu-initcontainer:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
seLinuxOptions:
@ -36,7 +36,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.hostIP
image: intel/intel-gpu-plugin:0.26.1
image: intel/intel-gpu-plugin:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
seLinuxOptions:

View File

@ -21,7 +21,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: intel/intel-iaa-plugin:0.26.1
image: intel/intel-iaa-plugin:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
readOnlyRootFilesystem: true

View File

@ -14,7 +14,7 @@ spec:
fieldPath: spec.nodeName
- name: DEVICE_TYPE
value: "iaa"
image: intel/intel-idxd-config-initcontainer:0.26.1
image: intel/intel-idxd-config-initcontainer:0.26.2
securityContext:
readOnlyRootFilesystem: true
privileged: true

View File

@ -23,7 +23,7 @@ spec:
control-plane: controller-manager
spec:
containers:
- image: docker.io/intel/intel-deviceplugin-operator:0.26.1
- image: docker.io/intel/intel-deviceplugin-operator:0.26.2
imagePullPolicy: IfNotPresent
name: manager
livenessProbe:
@ -41,10 +41,10 @@ spec:
resources:
limits:
cpu: 100m
memory: 50Mi
memory: 120Mi
requests:
cpu: 100m
memory: 20Mi
memory: 100Mi
securityContext:
runAsNonRoot: true
runAsUser: 65532

View File

@ -5,7 +5,7 @@ metadata:
alm-examples: '[]'
capabilities: Seamless Upgrades
categories: Drivers and plugins
containerImage: docker.io/intel/intel-deviceplugin-operator:0.26.1
containerImage: docker.io/intel/intel-deviceplugin-operator:0.26.2
createdAt: "2022-11-09"
description: This operator is a Kubernetes custom controller whose goal is to
serve the installation and lifecycle management of Intel device plugins for

View File

@ -9,8 +9,8 @@ metadata:
# annotations:
# container.apparmor.security.beta.kubernetes.io/intel-dlb-plugin: unconfined
spec:
image: intel/intel-dlb-plugin:0.26.1
initImage: intel/intel-dlb-initcontainer:0.26.1
image: intel/intel-dlb-plugin:0.26.2
initImage: intel/intel-dlb-initcontainer:0.26.2
logLevel: 4
nodeSelector:
intel.feature.node.kubernetes.io/dlb: 'true'

View File

@ -3,8 +3,8 @@ kind: DsaDevicePlugin
metadata:
name: dsadeviceplugin-sample
spec:
image: intel/intel-dsa-plugin:0.26.1
initImage: intel/intel-idxd-config-initcontainer:0.26.1
image: intel/intel-dsa-plugin:0.26.2
initImage: intel/intel-idxd-config-initcontainer:0.26.2
sharedDevNum: 10
logLevel: 4
nodeSelector:

View File

@ -3,8 +3,8 @@ kind: FpgaDevicePlugin
metadata:
name: fpgadeviceplugin-sample
spec:
image: intel/intel-fpga-plugin:0.26.1
initImage: intel/intel-fpga-initcontainer:0.26.1
image: intel/intel-fpga-plugin:0.26.2
initImage: intel/intel-fpga-initcontainer:0.26.2
mode: region
logLevel: 4
nodeSelector:

View File

@ -3,8 +3,8 @@ kind: GpuDevicePlugin
metadata:
name: gpudeviceplugin-sample
spec:
image: intel/intel-gpu-plugin:0.26.1
initImage: intel/intel-gpu-initcontainer:0.26.1
image: intel/intel-gpu-plugin:0.26.2
initImage: intel/intel-gpu-initcontainer:0.26.2
sharedDevNum: 10
logLevel: 4
nodeSelector:

View File

@ -3,8 +3,8 @@ kind: IaaDevicePlugin
metadata:
name: iaadeviceplugin-sample
spec:
image: intel/intel-iaa-plugin:0.26.1
initImage: intel/intel-idxd-config-initcontainer:0.26.1
image: intel/intel-iaa-plugin:0.26.2
initImage: intel/intel-idxd-config-initcontainer:0.26.2
sharedDevNum: 10
logLevel: 4
nodeSelector:

View File

@ -9,8 +9,8 @@ metadata:
# annotations:
# container.apparmor.security.beta.kubernetes.io/intel-qat-plugin: unconfined
spec:
image: intel/intel-qat-plugin:0.26.1
initImage: intel/intel-qat-initcontainer:0.26.1
image: intel/intel-qat-plugin:0.26.2
initImage: intel/intel-qat-initcontainer:0.26.2
dpdkDriver: vfio-pci
kernelVfDrivers:
- c6xxvf

View File

@ -3,8 +3,8 @@ kind: SgxDevicePlugin
metadata:
name: sgxdeviceplugin-sample
spec:
image: intel/intel-sgx-plugin:0.26.1
initImage: intel/intel-sgx-initcontainer:0.26.1
image: intel/intel-sgx-plugin:0.26.2
initImage: intel/intel-sgx-initcontainer:0.26.2
enclaveLimit: 110
provisionLimit: 110
logLevel: 4

View File

@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: crypto-perf
image: intel/crypto-perf:0.26.1
image: intel/crypto-perf:0.26.2
imagePullPolicy: IfNotPresent
command: [ "/bin/bash", "-c", "--" ]
args: [ "while true; do sleep 300000; done;" ]

View File

@ -19,7 +19,7 @@ spec:
readOnlyRootFilesystem: true
allowPrivilegeEscalation: false
privileged: true
image: intel/intel-qat-plugin:0.26.1
image: intel/intel-qat-plugin:0.26.2
imagePullPolicy: IfNotPresent
args: ["-mode", "kernel"]
volumeMounts:

View File

@ -21,7 +21,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: intel/intel-qat-plugin:0.26.1
image: intel/intel-qat-plugin:0.26.2
securityContext:
seLinuxOptions:
type: "container_device_plugin_t"

View File

@ -12,7 +12,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: intel/intel-qat-initcontainer:0.26.1
image: intel/intel-qat-initcontainer:0.26.2
securityContext:
readOnlyRootFilesystem: true
privileged: true

View File

@ -16,7 +16,7 @@ spec:
control-plane: controller-manager
spec:
containers:
- image: intel/intel-sgx-admissionwebhook:0.26.1
- image: intel/intel-sgx-admissionwebhook:0.26.2
imagePullPolicy: IfNotPresent
name: manager
securityContext:

View File

@ -16,7 +16,7 @@ spec:
automountServiceAccountToken: false
containers:
- name: intel-sgx-plugin
image: intel/intel-sgx-plugin:0.26.1
image: intel/intel-sgx-plugin:0.26.2
securityContext:
seLinuxOptions:
type: "container_device_plugin_t"

View File

@ -7,7 +7,7 @@ spec:
spec:
initContainers:
- name: intel-sgx-initcontainer
image: intel/intel-sgx-initcontainer:0.26.1
image: intel/intel-sgx-initcontainer:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
readOnlyRootFilesystem: true

View File

@ -7,7 +7,7 @@ spec:
spec:
initContainers:
- name: intel-sgx-initcontainer
image: intel/intel-sgx-initcontainer:0.26.1
image: intel/intel-sgx-initcontainer:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
readOnlyRootFilesystem: true

View File

@ -16,7 +16,7 @@ spec:
serviceAccountName: sgx-plugin
containers:
- name: sgx-node-init
image: intel/intel-sgx-initcontainer:0.26.1
image: intel/intel-sgx-initcontainer:0.26.2
imagePullPolicy: IfNotPresent
command:
- /usr/local/bin/sgx-sw/intel-sgx-epchook

View File

@ -21,7 +21,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: intel/intel-vpu-plugin:0.26.1
image: intel/intel-vpu-plugin:0.26.2
imagePullPolicy: IfNotPresent
securityContext:
readOnlyRootFilesystem: true

View File

@ -13,7 +13,7 @@ spec:
path: "/etc/kubernetes/node-feature-discovery/features.d/"
containers:
- name: xelink-sidecar
image: intel/intel-xpumanager-sidecar:0.26.1
image: intel/intel-xpumanager-sidecar:0.26.2
imagePullPolicy: Always
args:
- -v=2

82
go.mod
View File

@ -14,16 +14,16 @@ require (
github.com/pkg/errors v0.9.1
github.com/prometheus/client_model v0.3.0
github.com/prometheus/common v0.39.0
golang.org/x/sys v0.4.0
golang.org/x/text v0.6.0
golang.org/x/sys v0.6.0
golang.org/x/text v0.8.0
google.golang.org/grpc v1.52.0
k8s.io/api v0.26.1
k8s.io/apimachinery v0.26.1
k8s.io/api v0.26.7
k8s.io/apimachinery v0.26.7
k8s.io/client-go v1.5.2
k8s.io/component-base v0.26.1
k8s.io/component-base v0.26.7
k8s.io/klog/v2 v2.80.1
k8s.io/kubelet v1.26.1
k8s.io/kubernetes v1.26.1
k8s.io/kubelet v1.26.7
k8s.io/kubernetes v1.26.7
k8s.io/pod-security-admission v0.0.0
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/controller-runtime v0.14.1
@ -78,9 +78,9 @@ require (
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
@ -90,45 +90,45 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.26.0 // indirect
k8s.io/apiserver v0.26.1 // indirect
k8s.io/component-helpers v0.26.1 // indirect
k8s.io/apiserver v0.26.7 // indirect
k8s.io/component-helpers v0.26.7 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/kubectl v0.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
replace (
k8s.io/api => k8s.io/api v0.26.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.1
k8s.io/apimachinery => k8s.io/apimachinery v0.26.2-rc.0
k8s.io/apiserver => k8s.io/apiserver v0.26.1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.1
k8s.io/client-go => k8s.io/client-go v0.26.1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.1
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.1
k8s.io/code-generator => k8s.io/code-generator v0.26.2-rc.0
k8s.io/component-base => k8s.io/component-base v0.26.1
k8s.io/component-helpers => k8s.io/component-helpers v0.26.1
k8s.io/controller-manager => k8s.io/controller-manager v0.26.1
k8s.io/cri-api => k8s.io/cri-api v0.26.2-rc.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.1
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.1
k8s.io/kms => k8s.io/kms v0.26.2-rc.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.1
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.1
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.1
k8s.io/kubectl => k8s.io/kubectl v0.26.1
k8s.io/kubelet => k8s.io/kubelet v0.26.1
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.1
k8s.io/metrics => k8s.io/metrics v0.26.1
k8s.io/mount-utils => k8s.io/mount-utils v0.26.2-rc.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.1
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.1
k8s.io/sample-controller => k8s.io/sample-controller v0.26.1
k8s.io/api => k8s.io/api v0.26.7
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.7
k8s.io/apimachinery => k8s.io/apimachinery v0.26.7
k8s.io/apiserver => k8s.io/apiserver v0.26.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.7
k8s.io/client-go => k8s.io/client-go v0.26.7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.7
k8s.io/code-generator => k8s.io/code-generator v0.26.7
k8s.io/component-base => k8s.io/component-base v0.26.7
k8s.io/component-helpers => k8s.io/component-helpers v0.26.7
k8s.io/controller-manager => k8s.io/controller-manager v0.26.7
k8s.io/cri-api => k8s.io/cri-api v0.26.7
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.7
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.7
k8s.io/kms => k8s.io/kms v0.26.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.7
k8s.io/kubectl => k8s.io/kubectl v0.26.7
k8s.io/kubelet => k8s.io/kubelet v0.26.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.7
k8s.io/metrics => k8s.io/metrics v0.26.7
k8s.io/mount-utils => k8s.io/mount-utils v0.26.7
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.7
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.7
k8s.io/sample-controller => k8s.io/sample-controller v0.26.7
)
replace github.com/onsi/gomega v1.24.1 => github.com/onsi/gomega v1.24.0

64
go.sum
View File

@ -358,8 +358,8 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@ -410,19 +410,19 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@ -592,39 +592,39 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
k8s.io/apimachinery v0.26.2-rc.0 h1:f9BARTuEy0MguW4KGK6VwEBT9BCe03lYde0wnWxBilk=
k8s.io/apimachinery v0.26.2-rc.0/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
k8s.io/apiserver v0.26.1 h1:6vmnAqCDO194SVCPU3MU8NcDgSqsUA62tBUSWrFXhsc=
k8s.io/apiserver v0.26.1/go.mod h1:wr75z634Cv+sifswE9HlAo5FQ7UoUauIICRlOE+5dCg=
k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU=
k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE=
k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
k8s.io/component-helpers v0.26.1 h1:Y5h1OYUJTGyHZlSAsc7mcfNsWF08S/MlrQyF/vn93mU=
k8s.io/component-helpers v0.26.1/go.mod h1:jxNTnHb1axLe93MyVuvKj9T/+f4nxBVrj/xf01/UNFk=
k8s.io/api v0.26.7 h1:Lf4iEBEJb5OFNmawtBfSZV/UNi9riSJ0t1qdhyZqI40=
k8s.io/api v0.26.7/go.mod h1:Vk9bMadzA49UHPmHB//lX7VRCQSXGoVwfLd3Sc1SSXI=
k8s.io/apiextensions-apiserver v0.26.7 h1:L7ImW831auK1ZQBtNJPaG5qyrFxeISEBlgfZJfnaIPk=
k8s.io/apiextensions-apiserver v0.26.7/go.mod h1:3DbZBfS3kO7/Jaj7qqzcBtPcKP0/KcklyAnk8zc+fs4=
k8s.io/apimachinery v0.26.7 h1:590jSBwaSHCAFCqltaEogY/zybFlhGsnLteLpuF2wig=
k8s.io/apimachinery v0.26.7/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
k8s.io/apiserver v0.26.7 h1:NX/zBZZn4R+Cq6shwyn8Pn8REd0yJJ16dbtv9WkEVEU=
k8s.io/apiserver v0.26.7/go.mod h1:r0wDRWHI7VL/KlQLTkJJBVGZ3KeNfv+VetlyRtr86xs=
k8s.io/client-go v0.26.7 h1:hyU9aKHlwVOykgyxzGYkrDSLCc4+mimZVyUJjPyUn1E=
k8s.io/client-go v0.26.7/go.mod h1:okYjy0jtq6sdeztALDvCh24tg4opOQS1XNvsJlERDAo=
k8s.io/component-base v0.26.7 h1:uqsOyZh0Zqoaup8tmHa491D/CvgFdGUs+X2H/inNUKM=
k8s.io/component-base v0.26.7/go.mod h1:CZe1HTmX/DQdeBrb9XYOXzs96jXth8ZbFvhLMsoJLUg=
k8s.io/component-helpers v0.26.7 h1:WWdNnJfRQcsxP1NCcMhGMpi9vdlOKPFzZzx48wREvzE=
k8s.io/component-helpers v0.26.7/go.mod h1:r98dtcDwYAv+awPp9hIS6Y35q+jX4YvpX1egBO0u8hw=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
k8s.io/kubectl v0.26.1 h1:K8A0Jjlwg8GqrxOXxAbjY5xtmXYeYjLU96cHp2WMQ7s=
k8s.io/kubectl v0.26.1/go.mod h1:miYFVzldVbdIiXMrHZYmL/EDWwJKM+F0sSsdxsATFPo=
k8s.io/kubelet v0.26.1 h1:wQyCQYmLW6GN3v7gVTxnc3jAE4zMYDlzdF3FZV4rKas=
k8s.io/kubelet v0.26.1/go.mod h1:gFVZ1Ab4XdjtnYdVRATwGwku7FhTxo6LVEZwYoQaDT8=
k8s.io/kubernetes v1.26.1 h1:N+qxlptxpSU/VSLvqBGWyyw/kNhJRpEn1b5YP57+5rk=
k8s.io/kubernetes v1.26.1/go.mod h1:dEfAfGVZBOr2uZLeVazLPj/8E+t8jYFbQqCiBudkB8o=
k8s.io/pod-security-admission v0.26.1 h1:EDIxsYFeKMzNvN/JB0PgQcuwBP6fIkIG2O8ZWJhzOp4=
k8s.io/pod-security-admission v0.26.1/go.mod h1:hCbYTG5UtLlivmukkMPjAWf23PUBUHzEvR60xNVWN4c=
k8s.io/kubectl v0.26.7 h1:s24r6MjKDMW4sMOsuBLaNYQHlweTZeDC0BPkMiom8s0=
k8s.io/kubectl v0.26.7/go.mod h1:4PGqS2bPQ5yGE0ZSQajzYdWKFUAi8HiuWBZQ2/iEFHg=
k8s.io/kubelet v0.26.7 h1:YzVtyhQzKcpbZktVyeOMzE5d77fFUKf5TiWD/fDKMnc=
k8s.io/kubelet v0.26.7/go.mod h1:X/T8bnhE26lE5hOkpAVXx0MQQfXg1dwlsngz7avDWyI=
k8s.io/kubernetes v1.26.7 h1:524bMbtT/JVip9yO/nm0vrNsS/pswo0BS5U11nvjN6U=
k8s.io/kubernetes v1.26.7/go.mod h1:EBE8dfGfk2sZ3yzZVQjr1wQ/k28/wwaajL/1+77Cjmg=
k8s.io/pod-security-admission v0.26.7 h1:HNzfuXlo8QMOLHBUnFydLJ/nDSdiv/AAqMI6kZjF5Qc=
k8s.io/pod-security-admission v0.26.7/go.mod h1:/YQf4FOvgi6ElokZn6KebLFo904bOTdMuMhKJW3z1zw=
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y=
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 h1:+xBL5uTc+BkPBwmMi3vYfUJjq+N3K+H6PXeETwf5cPI=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35/go.mod h1:WxjusMwXlKzfAs4p9km6XJRndVt2FROgMVCE4cdohFo=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 h1:fAPTNEpzQMOLMGwOHNbUkR2xXTQwMJOZYNx+/mLlOh0=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37/go.mod h1:vfnxT4FXNT8eGvO+xi/DsyC/qHmdujqwrUa1WSspCsk=
sigs.k8s.io/controller-runtime v0.14.1 h1:vThDes9pzg0Y+UbCPY3Wj34CGIYPgdmspPm2GIpxpzM=
sigs.k8s.io/controller-runtime v0.14.1/go.mod h1:GaRkrY8a7UZF0kqFFbUKG7n9ICiTY5T55P1RiE3UZlU=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

View File

@ -181,7 +181,7 @@ func TestNewDaemonSetFPGA(t *testing.T) {
plugin := &devicepluginv1.FpgaDevicePlugin{
Spec: devicepluginv1.FpgaDevicePluginSpec{
InitImage: "intel/intel-fpga-initcontainer:0.26.1",
InitImage: "intel/intel-fpga-initcontainer:0.26.2",
},
}

View File

@ -199,7 +199,7 @@ func TestNewDamonSetGPU(t *testing.T) {
}
if tc.isInitImage {
plugin.Spec.InitImage = "intel/intel-gpu-initcontainer:0.26.1"
plugin.Spec.InitImage = "intel/intel-gpu-initcontainer:0.26.2"
}
t.Run(tc.name, func(t *testing.T) {

View File

@ -37,6 +37,7 @@ import (
const (
ownerKey = ".metadata.controller.qat"
initcontainerName = "intel-qat-initcontainer"
qatConfigVolume = "intel-qat-config-volume"
)
var defaultNodeSelector = deployments.QATPluginDaemonSet().Spec.Template.Spec.NodeSelector
@ -96,10 +97,7 @@ func (c *controller) NewDaemonSet(rawObj client.Object) *apps.DaemonSet {
daemonSet.Spec.Template.Spec.NodeSelector = devicePlugin.Spec.NodeSelector
}
if devicePlugin.Spec.InitImage == "" {
daemonSet.Spec.Template.Spec.InitContainers = nil
daemonSet.Spec.Template.Spec.Volumes = removeVolume(daemonSet.Spec.Template.Spec.Volumes, "sysfs")
} else {
if devicePlugin.Spec.InitImage != "" {
setInitContainer(&daemonSet.Spec.Template.Spec, devicePlugin.Spec)
}
@ -129,7 +127,7 @@ func (c *controller) UpdateDaemonSet(rawObj client.Object, ds *apps.DaemonSet) (
if ds.Spec.Template.Spec.InitContainers != nil {
ds.Spec.Template.Spec.InitContainers = nil
ds.Spec.Template.Spec.Volumes = removeVolume(ds.Spec.Template.Spec.Volumes, "sysfs")
ds.Spec.Template.Spec.Volumes = removeVolume(ds.Spec.Template.Spec.Volumes, "qat-config")
ds.Spec.Template.Spec.Volumes = removeVolume(ds.Spec.Template.Spec.Volumes, qatConfigVolume)
updated = true
}
} else {
@ -220,7 +218,7 @@ func setInitContainer(dsSpec *v1.PodSpec, dpSpec devicepluginv1.QatDevicePluginS
{
Image: dpSpec.InitImage,
ImagePullPolicy: "IfNotPresent",
Name: "init-sriov-numvfs",
Name: initcontainerName,
Env: []v1.EnvVar{
{
Name: "ENABLED_QAT_PF_PCIIDS",
@ -254,20 +252,35 @@ func setInitContainer(dsSpec *v1.PodSpec, dpSpec devicepluginv1.QatDevicePluginS
mode := int32(0440)
if dpSpec.ProvisioningConfig != "" {
dsSpec.Volumes = append(dsSpec.Volumes, v1.Volume{
Name: "qat-config",
qatVol := v1.Volume{
Name: qatConfigVolume,
VolumeSource: v1.VolumeSource{
ConfigMap: &v1.ConfigMapVolumeSource{
LocalObjectReference: v1.LocalObjectReference{Name: dpSpec.ProvisioningConfig},
DefaultMode: &mode,
},
},
})
}
volumeUpdated := false
// update ProvisioningConfig volume
for idx, vol := range dsSpec.Volumes {
if vol.Name == qatConfigVolume {
dsSpec.Volumes[idx] = qatVol
volumeUpdated = true
}
}
// or add if it's completely missing
if !volumeUpdated {
dsSpec.Volumes = append(dsSpec.Volumes, qatVol)
}
for i, initcontainer := range dsSpec.InitContainers {
if initcontainer.Name == initcontainerName {
dsSpec.InitContainers[i].VolumeMounts = append(dsSpec.InitContainers[i].VolumeMounts, v1.VolumeMount{
Name: "qat-config",
Name: qatConfigVolume,
MountPath: "/qat-init/conf",
})
}

View File

@ -37,7 +37,7 @@ import (
var (
bKeeper = &bookKeeper{}
ImageMinVersion = versionutil.MustParseSemantic("0.26.1")
ImageMinVersion = versionutil.MustParseSemantic("0.26.2")
)
func init() {

View File

@ -102,7 +102,7 @@ func runTestCase(fmw *framework.Framework, pluginKustomizationPath, mappingsColl
}
resource = v1.ResourceName(podResource)
image := "intel/opae-nlb-demo:0.26.1"
image := "intel/opae-nlb-demo:0.26.2"
ginkgo.By("submitting a pod requesting correct FPGA resources")

View File

@ -136,7 +136,7 @@ var _ = Describe("QatDevicePlugin Controller", func() {
}
mode := int32(0440)
expectedVolume := v1.Volume{
Name: "qat-config",
Name: "intel-qat-config-volume",
VolumeSource: v1.VolumeSource{
ConfigMap: &v1.ConfigMapVolumeSource{
LocalObjectReference: v1.LocalObjectReference{Name: updatedProvisioningConfig},