From 7d8a33c30f6a363f34d9d0ad351c54f3e4cde393 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 9 Apr 2020 15:21:33 +0300 Subject: [PATCH] fpga webhook: fix deployment issue Webhook uses region CRDs even if run in preprogrammed mode. Adding them to the base configuration should fix this deployment error: Failed to list *v1.FpgaRegion: the server could not find the requested resource Fixes: #361 --- deployments/fpga_admissionwebhook/base/kustomization.yaml | 2 ++ .../orchestrated/fpgaregion-crd.yaml => base/region-crd.yaml} | 0 .../orchestrated/fpgaregions.yaml => base/regions.yaml} | 0 .../overlays/orchestrated/kustomization.yaml | 4 ---- 4 files changed, 2 insertions(+), 4 deletions(-) rename deployments/fpga_admissionwebhook/{overlays/orchestrated/fpgaregion-crd.yaml => base/region-crd.yaml} (100%) rename deployments/fpga_admissionwebhook/{overlays/orchestrated/fpgaregions.yaml => base/regions.yaml} (100%) diff --git a/deployments/fpga_admissionwebhook/base/kustomization.yaml b/deployments/fpga_admissionwebhook/base/kustomization.yaml index 61343951d..65f1ea844 100644 --- a/deployments/fpga_admissionwebhook/base/kustomization.yaml +++ b/deployments/fpga_admissionwebhook/base/kustomization.yaml @@ -3,6 +3,8 @@ resources: - intel-fpga-webhook-deployment.yaml - intel-fpga-webhook-svc.yaml - fpga-mutator-webhook-cfg.yaml + - region-crd.yaml + - regions.yaml - acceleratorfunction-crd.yaml - acceleratorfunctions.yaml diff --git a/deployments/fpga_admissionwebhook/overlays/orchestrated/fpgaregion-crd.yaml b/deployments/fpga_admissionwebhook/base/region-crd.yaml similarity index 100% rename from deployments/fpga_admissionwebhook/overlays/orchestrated/fpgaregion-crd.yaml rename to deployments/fpga_admissionwebhook/base/region-crd.yaml diff --git a/deployments/fpga_admissionwebhook/overlays/orchestrated/fpgaregions.yaml b/deployments/fpga_admissionwebhook/base/regions.yaml similarity index 100% rename from deployments/fpga_admissionwebhook/overlays/orchestrated/fpgaregions.yaml rename to deployments/fpga_admissionwebhook/base/regions.yaml diff --git a/deployments/fpga_admissionwebhook/overlays/orchestrated/kustomization.yaml b/deployments/fpga_admissionwebhook/overlays/orchestrated/kustomization.yaml index 064dd2099..fa92aa7a3 100644 --- a/deployments/fpga_admissionwebhook/overlays/orchestrated/kustomization.yaml +++ b/deployments/fpga_admissionwebhook/overlays/orchestrated/kustomization.yaml @@ -1,10 +1,6 @@ bases: - ../../base -resources: - - fpgaregion-crd.yaml - - fpgaregions.yaml - patchesJson6902: - target: group: apps