diff --git a/.gitignore b/.gitignore index a1c9d71e..7c3caaf9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,9 @@ cmd/fpga_plugin/fpga_plugin cmd/fpga_tool/fpga_tool cmd/gpu_plugin/gpu_plugin cmd/qat_plugin/qat_plugin +cmd/sgx_plugin/sgx_plugin +cmd/sgx_epchook/sgx_epchook +cmd/vpu_plugin/vpu_plugin cmd/operator/operator deployments/fpga_admissionwebhook/base/intel-fpga-webhook-certs-secret diff --git a/Makefile b/Makefile index 59d596c5..3e88e953 100644 --- a/Makefile +++ b/Makefile @@ -44,8 +44,9 @@ test-with-kind: @$(PODMAN) tag localhost/intel/intel-fpga-admissionwebhook:devel docker.io/intel/intel-fpga-admissionwebhook:devel @mkdir -p $(e2e_tmp_dir) @$(PODMAN) save "docker.io/intel/intel-fpga-admissionwebhook:devel" -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) create cluster --name "intel-device-plugins" --kubeconfig $(e2e_tmp_dir)/kubeconfig --image "kindest/node:v1.19.0" @$(KIND) load image-archive --name "intel-device-plugins" $(e2e_tmp_dir)/$(WEBHOOK_IMAGE_FILE) + $(KUBECTL) --kubeconfig=$(e2e_tmp_dir)/kubeconfig apply -f https://github.com/jetstack/cert-manager/releases/download/v1.0.0/cert-manager.yaml @$(GO) test -v ./test/e2e -args -kubeconfig $(e2e_tmp_dir)/kubeconfig -kubectl-path $(KUBECTL) -ginkgo.focus "Webhook" || rc=1; \ $(KIND) delete cluster --name "intel-device-plugins"; \ rm -rf $(e2e_tmp_dir); \ diff --git a/cmd/fpga_admissionwebhook/README.md b/cmd/fpga_admissionwebhook/README.md index 3a320d5d..02532c6f 100644 --- a/cmd/fpga_admissionwebhook/README.md +++ b/cmd/fpga_admissionwebhook/README.md @@ -53,7 +53,7 @@ The webhook depends on having [cert-manager](https://cert-manager.io/) installed: ```bash -$ kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v0.15.1/cert-manager.yaml +$ kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.0.0/cert-manager.yaml ``` Also if your cluster operates behind a corporate proxy make sure that the API diff --git a/cmd/operator/README.md b/cmd/operator/README.md index 06a79d17..89d9e602 100644 --- a/cmd/operator/README.md +++ b/cmd/operator/README.md @@ -18,7 +18,7 @@ The operator depends on [cert-manager](https://cert-manager.io/) running in the To install it run: ``` -$ kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v0.15.1/cert-manager.yaml +$ kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.0.0/cert-manager.yaml ``` Make sure all the pods in the `cert-manager` namespace are up and running: diff --git a/deployments/fpga_admissionwebhook/base/kustomization.yaml b/deployments/fpga_admissionwebhook/base/kustomization.yaml index a86e8826..b600ca95 100644 --- a/deployments/fpga_admissionwebhook/base/kustomization.yaml +++ b/deployments/fpga_admissionwebhook/base/kustomization.yaml @@ -16,7 +16,7 @@ vars: objref: kind: Certificate group: cert-manager.io - version: v1alpha2 + version: v1 name: serving-cert # this name should match the one in certificate.yaml fieldref: fieldpath: metadata.namespace @@ -24,7 +24,7 @@ vars: objref: kind: Certificate group: cert-manager.io - version: v1alpha2 + version: v1 name: serving-cert # this name should match the one in certificate.yaml - name: SERVICE_NAMESPACE # namespace of the service objref: diff --git a/deployments/fpga_admissionwebhook/certmanager/certificate.yaml b/deployments/fpga_admissionwebhook/certmanager/certificate.yaml index 99c3dd0c..39e8ee4b 100644 --- a/deployments/fpga_admissionwebhook/certmanager/certificate.yaml +++ b/deployments/fpga_admissionwebhook/certmanager/certificate.yaml @@ -1,8 +1,6 @@ # The following manifests contain a self-signed issuer CR and a certificate CR. # More document can be found at https://docs.cert-manager.io -# WARNING: Targets CertManager 0.15.1 check https://docs.cert-manager.io/en/latest/tasks/upgrading/index.html for -# breaking changes -apiVersion: cert-manager.io/v1alpha2 +apiVersion: cert-manager.io/v1 kind: Issuer metadata: name: selfsigned-issuer @@ -10,7 +8,7 @@ metadata: spec: selfSigned: {} --- -apiVersion: cert-manager.io/v1alpha2 +apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: serving-cert # this name should match the one appeared in kustomizeconfig.yaml diff --git a/deployments/operator/certmanager/certificate.yaml b/deployments/operator/certmanager/certificate.yaml index 3d46cff8..39e8ee4b 100644 --- a/deployments/operator/certmanager/certificate.yaml +++ b/deployments/operator/certmanager/certificate.yaml @@ -1,8 +1,6 @@ # The following manifests contain a self-signed issuer CR and a certificate CR. # More document can be found at https://docs.cert-manager.io -# WARNING: Targets CertManager 0.11 check https://docs.cert-manager.io/en/latest/tasks/upgrading/index.html for -# breaking changes -apiVersion: cert-manager.io/v1alpha2 +apiVersion: cert-manager.io/v1 kind: Issuer metadata: name: selfsigned-issuer @@ -10,7 +8,7 @@ metadata: spec: selfSigned: {} --- -apiVersion: cert-manager.io/v1alpha2 +apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: serving-cert # this name should match the one appeared in kustomizeconfig.yaml diff --git a/deployments/operator/default/kustomization.yaml b/deployments/operator/default/kustomization.yaml index e7d137e9..06c12f5b 100644 --- a/deployments/operator/default/kustomization.yaml +++ b/deployments/operator/default/kustomization.yaml @@ -34,7 +34,7 @@ vars: objref: kind: Certificate group: cert-manager.io - version: v1alpha2 + version: v1 name: serving-cert # this name should match the one in certificate.yaml fieldref: fieldpath: metadata.namespace @@ -42,7 +42,7 @@ vars: objref: kind: Certificate group: cert-manager.io - version: v1alpha2 + version: v1 name: serving-cert # this name should match the one in certificate.yaml - name: SERVICE_NAMESPACE # namespace of the service objref: