Merge pull request #417 from mythi/r18

Prepare for release-0.18

Author: mythi

Jenkinsfile

@@ -11,7 +11,7 @@ pipeline {
     RUNC_VERSION="v1.0.0-rc90"
     CRIO_VERSION="v1.18.2"
     GOLANGCI_LINT_VERSION="v1.27.0"
-    BUILDAH_VERSION="v1.15.0"
+    BUILDAH_VERSION="v1.14.9"
     GO_VERSION="1.13.12"
     GO_TAR="go${GO_VERSION}.linux-amd64.tar.gz"
     GOROOT="/usr/local/go"

Makefile

@@ -41,9 +41,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.18.0 docker.io/intel/intel-fpga-admissionwebhook:0.18.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.18.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; \
@@ -88,7 +88,7 @@ clean:
 
 ORG?=intel
 REG?=$(ORG)/
-TAG?=devel
+TAG?=0.18.0
 export TAG
 
 pre-pull:

README.md

@@ -217,6 +217,7 @@ matching Kubernetes versions are listed below:
 
 | Branch            | Kubernetes branch/version      |
 |:------------------|:-------------------------------|
+| release-0.18      | Kubernetes 1.18 branch v1.18.x |
 | release-0.17      | Kubernetes 1.17 branch v1.17.x |
 | release-0.15      | Kubernetes 1.15 branch v1.15.x |
 | release-0.11      | Kubernetes 1.11 branch v1.11.x |

build/docker/intel-deviceplugin-operator.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:9f04d3cc0ca3f6951ab3646639b43eb73e963a7cee7322d619a02c7eeecce711
 
 FROM ${CLEAR_LINUX_BASE} as builder
 
-ARG CLEAR_LINUX_VERSION=
+ARG CLEAR_LINUX_VERSION="--version=33450"
 
 RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
 

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:9f04d3cc0ca3f6951ab3646639b43eb73e963a7cee7322d619a02c7eeecce711
 
 FROM ${CLEAR_LINUX_BASE} as builder
 
-ARG CLEAR_LINUX_VERSION=
+ARG CLEAR_LINUX_VERSION="--version=33450"
 
 RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
 

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:9f04d3cc0ca3f6951ab3646639b43eb73e963a7cee7322d619a02c7eeecce711
 
 FROM ${CLEAR_LINUX_BASE} as builder
 
-ARG CLEAR_LINUX_VERSION=
+ARG CLEAR_LINUX_VERSION="--version=33450"
 
 RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
 

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:9f04d3cc0ca3f6951ab3646639b43eb73e963a7cee7322d619a02c7eeecce711
 
 FROM ${CLEAR_LINUX_BASE} as builder
 
-ARG CLEAR_LINUX_VERSION=
+ARG CLEAR_LINUX_VERSION="--version=33450"
 
 RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
 

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:9f04d3cc0ca3f6951ab3646639b43eb73e963a7cee7322d619a02c7eeecce711
 
 FROM ${CLEAR_LINUX_BASE} as builder
 
-ARG CLEAR_LINUX_VERSION=
+ARG CLEAR_LINUX_VERSION="--version=33450"
 
 RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
 

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:9f04d3cc0ca3f6951ab3646639b43eb73e963a7cee7322d619a02c7eeecce711
 
 FROM ${CLEAR_LINUX_BASE} as builder
 
-ARG CLEAR_LINUX_VERSION=
+ARG CLEAR_LINUX_VERSION="--version=33450"
 
 RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
 

build/docker/intel-vpu-plugin.Dockerfile

@@ -6,9 +6,9 @@
 #
 # 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:9f04d3cc0ca3f6951ab3646639b43eb73e963a7cee7322d619a02c7eeecce711
 FROM ${CLEAR_LINUX_BASE} as builder
-ARG CLEAR_LINUX_VERSION=
+ARG CLEAR_LINUX_VERSION="--version=33450"
 
 RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
 RUN swupd bundle-add devpkg-libusb

cmd/fpga_admissionwebhook/README.md

@@ -90,7 +90,7 @@ spec:
 To deploy the webhook, run
 
 ```bash
-$ kubectl apply -k https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/fpga_admissionwebhook/default?ref=master
+$ kubectl apply -k https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/fpga_admissionwebhook/default?ref=<target branch, e.g, release-xyz>
 namespace/intelfpgawebhook-system created
 customresourcedefinition.apiextensions.k8s.io/acceleratorfunctions.fpga.intel.com created
 customresourcedefinition.apiextensions.k8s.io/fpgaregions.fpga.intel.com created

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:fc47d67eaa0f22c0a6c96250b485ae59e65b1b863ec91941935907c9e7210ae1
 
 FROM ${CLEAR_LINUX_BASE} as builder
 
-ARG CLEAR_LINUX_VERSION=
+ARG CLEAR_LINUX_VERSION="--version=33450"
 
 RUN mkdir /install_root && \
     swupd os-install \

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.18.0
           imagePullPolicy: IfNotPresent
           securityContext:
             capabilities:

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:fc47d67eaa0f22c0a6c96250b485ae59e65b1b863ec91941935907c9e7210ae1
 
 FROM ${CLEAR_LINUX_BASE} as builder
 
-ARG CLEAR_LINUX_VERSION=
+ARG CLEAR_LINUX_VERSION="--version=33450"
 
 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

demo/test-fpga-orchestrated.yaml

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

demo/test-fpga-preprogrammed.yaml

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

deployments/fpga_admissionwebhook/manager/manager.yaml

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

deployments/fpga_plugin/base/intel-fpga-plugin-daemonset.yaml

@@ -21,7 +21,7 @@ spec:
     spec:
       initContainers:
       - name: intel-fpga-initcontainer
-        image: intel/intel-fpga-initcontainer:devel
+        image: intel/intel-fpga-initcontainer:0.18.0
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true
@@ -37,7 +37,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-        image: intel/intel-fpga-plugin:devel
+        image: intel/intel-fpga-plugin:0.18.0
         imagePullPolicy: IfNotPresent
         args:
           - -mode=af

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.18.0
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true

deployments/operator/manager/manager.yaml

@@ -23,7 +23,7 @@ spec:
         control-plane: controller-manager
     spec:
       containers:
-      - image: intel/intel-deviceplugin-operator:devel
+      - image: intel/intel-deviceplugin-operator:0.18.0
         name: manager
         resources:
           limits:

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.18.0
     imagePullPolicy: IfNotPresent
     command: [ "/bin/bash", "-c", "--" ]
     args: [ "while true; do sleep 300000; done;" ]

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.18.0
         imagePullPolicy: IfNotPresent
         args: ["-mode", "kernel"]
         volumeMounts:

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.18.0
         securityContext:
           readOnlyRootFilesystem: true
         env:

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.18.0
         imagePullPolicy: IfNotPresent
         securityContext:
           readOnlyRootFilesystem: true

scripts/set-version.sh

@@ -15,4 +15,4 @@ if [ $# != 1 ] || [ "$1" = "?" ] || [ "$1" = "--help" ]; then
     exit 1
 fi
 
-sed -i -e "s;\(^TAG?*=\|intel/crypto-perf:\|intel/opae-nlb-demo:\|intel/intel-[^ ]*:\)[^ ]*;\1$1;g" $(git grep -l '^TAG?*=\|intel/crypto-perf:\|intel/opae-nlb-demo:\|intel/intel-[^ ]*:' Makefile deployments demo/*fpga*.yaml)
+sed -i -e "s;\(^TAG?*=\|intel/crypto-perf:\|intel/opae-nlb-demo:\|intel/intel-[^ ]*:\)[^ \"]*;\1$1;g" $(git grep -l '^TAG?*=\|intel/crypto-perf:\|intel/opae-nlb-demo:\|intel/intel-[^ ]*:' Makefile deployments demo/*fpga*.yaml)

test/e2e/fpga/fpga.go

@@ -35,49 +35,42 @@ import (
 )
 
 const (
-	pluginKustomizationYaml  = "deployments/fpga_plugin/base/kustomization.yaml"
-	webhookKustomizationYaml = "deployments/fpga_admissionwebhook/default/kustomization.yaml"
-	nlb0NodeResource         = "fpga.intel.com/af-695.d84.aVKNtusxV3qMNmj5-qCB9thCTcSko8QT-J5DNoP5BAs"
-	nlb0PodResource          = "fpga.intel.com/arria10.dcp1.2-nlb0-orchestrated"
-	nlb3PodResource          = "fpga.intel.com/arria10.dcp1.2-nlb3-orchestrated"
-	nlb0PodResourceAF        = "fpga.intel.com/arria10.dcp1.2-nlb0-preprogrammed"
-	arria10NodeResource      = "fpga.intel.com/region-69528db6eb31577a8c3668f9faa081f6"
+	pluginKustomizationYaml = "deployments/fpga_plugin/base/kustomization.yaml"
+	mappingsCollectionYaml  = "deployments/fpga_admissionwebhook/mappings-collection.yaml"
+	nlb0NodeResource        = "fpga.intel.com/af-695.d84.aVKNtusxV3qMNmj5-qCB9thCTcSko8QT-J5DNoP5BAs"
+	nlb0PodResource         = "fpga.intel.com/arria10.dcp1.2-nlb0-orchestrated"
+	nlb3PodResource         = "fpga.intel.com/arria10.dcp1.2-nlb3-orchestrated"
+	nlb0PodResourceAF       = "fpga.intel.com/arria10.dcp1.2-nlb0-preprogrammed"
+	arria10NodeResource     = "fpga.intel.com/region-69528db6eb31577a8c3668f9faa081f6"
 )
 
 func init() {
 	ginkgo.Describe("FPGA Plugin E2E tests", describe)
 }
 
 func describe() {
-	webhookKustomizationPath, err := utils.LocateRepoFile(webhookKustomizationYaml)
+	pluginKustomizationPath, err := utils.LocateRepoFile(pluginKustomizationYaml)
 	if err != nil {
-		framework.Failf("unable to locate %q: %v", webhookKustomizationYaml, err)
+		framework.Failf("unable to locate %q: %v", pluginKustomizationYaml, err)
 	}
 
-	pluginKustomizationPath, err := utils.LocateRepoFile(pluginKustomizationYaml)
+	mappingsCollectionPath, err := utils.LocateRepoFile(mappingsCollectionYaml)
 	if err != nil {
-		framework.Failf("unable to locate %q: %v", pluginKustomizationYaml, err)
+		framework.Failf("unable to locate %q: %v", mappingsCollectionYaml, err)
 	}
 
 	fmw := framework.NewDefaultFramework("fpgaplugin-e2e")
 
 	ginkgo.It("Run FPGA plugin tests", func() {
-		// Deploy webhook
-		ginkgo.By(fmt.Sprintf("namespace %s: deploying webhook", fmw.Namespace.Name))
-		utils.DeployFpgaWebhook(fmw, webhookKustomizationPath)
-
-		ginkgo.By("deploying mappings")
-		framework.RunKubectlOrDie(fmw.Namespace.Name, "apply", "-n", fmw.Namespace.Name, "-f", filepath.Dir(webhookKustomizationPath)+"/../mappings-collection.yaml")
-
 		// Run region test case twice to ensure that device is reprogrammed at least once
-		runTestCase(fmw, pluginKustomizationPath, "region", arria10NodeResource, nlb3PodResource, "nlb3", "nlb0")
-		runTestCase(fmw, pluginKustomizationPath, "region", arria10NodeResource, nlb0PodResource, "nlb0", "nlb3")
+		runTestCase(fmw, pluginKustomizationPath, mappingsCollectionPath, "region", arria10NodeResource, nlb3PodResource, "nlb3", "nlb0")
+		runTestCase(fmw, pluginKustomizationPath, mappingsCollectionPath, "region", arria10NodeResource, nlb0PodResource, "nlb0", "nlb3")
 		// Run af test case
-		runTestCase(fmw, pluginKustomizationPath, "af", nlb0NodeResource, nlb0PodResourceAF, "nlb0", "nlb3")
+		runTestCase(fmw, pluginKustomizationPath, mappingsCollectionPath, "af", nlb0NodeResource, nlb0PodResourceAF, "nlb0", "nlb3")
 	})
 }
 
-func runTestCase(fmw *framework.Framework, pluginKustomizationPath, pluginMode, nodeResource, podResource, cmd1, cmd2 string) {
+func runTestCase(fmw *framework.Framework, pluginKustomizationPath, mappingsCollectionPath, pluginMode, nodeResource, podResource, cmd1, cmd2 string) {
 	tmpDir, err := ioutil.TempDir("", "fpgaplugine2etest-"+fmw.Namespace.Name)
 	if err != nil {
 		framework.Failf("unable to create temp directory: %v", err)
@@ -93,6 +86,9 @@ func runTestCase(fmw *framework.Framework, pluginKustomizationPath, pluginMode,
 	_, _ = framework.RunKubectl(fmw.Namespace.Name, "delete", "-k", tmpDir)
 	framework.RunKubectlOrDie(fmw.Namespace.Name, "apply", "-k", tmpDir)
 
+	ginkgo.By("deploying mappings")
+	framework.RunKubectlOrDie(fmw.Namespace.Name, "apply", "-n", fmw.Namespace.Name, "-f", mappingsCollectionPath)
+
 	waitForPod(fmw, "intel-fpga-plugin")
 
 	resource := v1.ResourceName(nodeResource)