From ebac4a25e702673d00b784edbd83477bdab984c3 Mon Sep 17 00:00:00 2001 From: Dipankar Das Date: Fri, 9 Jun 2023 12:49:24 +0530 Subject: [PATCH] Removal of the bases field as it is deprecated by kustomize Signed-off-by: Dipankar Das --- deployment/overlays/default-combined/kustomization.yaml | 4 +--- deployment/overlays/default-job/kustomization.yaml | 4 +--- deployment/overlays/default/kustomization.yaml | 4 +--- .../overlays/master-worker-topologyupdater/kustomization.yaml | 4 +--- deployment/overlays/prune/kustomization.yaml | 4 +--- deployment/overlays/topologyupdater/kustomization.yaml | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/deployment/overlays/default-combined/kustomization.yaml b/deployment/overlays/default-combined/kustomization.yaml index d980ea0b08..3eb74c4ed0 100644 --- a/deployment/overlays/default-combined/kustomization.yaml +++ b/deployment/overlays/default-combined/kustomization.yaml @@ -3,12 +3,10 @@ kind: Kustomization namespace: node-feature-discovery -bases: +resources: - ../../base/rbac - ../../base/nfd-crds - ../../base/master-worker-combined - -resources: - namespace.yaml components: diff --git a/deployment/overlays/default-job/kustomization.yaml b/deployment/overlays/default-job/kustomization.yaml index 8d2850000b..e1d6e124cd 100644 --- a/deployment/overlays/default-job/kustomization.yaml +++ b/deployment/overlays/default-job/kustomization.yaml @@ -3,13 +3,11 @@ kind: Kustomization namespace: node-feature-discovery -bases: +resources: - ../../base/rbac - ../../base/nfd-crds - ../../base/master - ../../base/worker-job - -resources: - namespace.yaml components: diff --git a/deployment/overlays/default/kustomization.yaml b/deployment/overlays/default/kustomization.yaml index 8774b59f8e..550adc01cb 100644 --- a/deployment/overlays/default/kustomization.yaml +++ b/deployment/overlays/default/kustomization.yaml @@ -3,13 +3,11 @@ kind: Kustomization namespace: node-feature-discovery -bases: +resources: - ../../base/rbac - ../../base/nfd-crds - ../../base/master - ../../base/worker-daemonset - -resources: - namespace.yaml components: diff --git a/deployment/overlays/master-worker-topologyupdater/kustomization.yaml b/deployment/overlays/master-worker-topologyupdater/kustomization.yaml index ebf0ac213a..19fa1bfcc8 100644 --- a/deployment/overlays/master-worker-topologyupdater/kustomization.yaml +++ b/deployment/overlays/master-worker-topologyupdater/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization namespace: node-feature-discovery -bases: +resources: - ../../base/rbac - ../../base/rbac-topologyupdater - ../../base/rbac-topology-gc @@ -13,8 +13,6 @@ bases: - ../../base/noderesourcetopologies-crd - ../../base/topologyupdater-daemonset - ../../base/topology-gc - -resources: - namespace.yaml components: diff --git a/deployment/overlays/prune/kustomization.yaml b/deployment/overlays/prune/kustomization.yaml index 903116c19c..af18c5f5fb 100644 --- a/deployment/overlays/prune/kustomization.yaml +++ b/deployment/overlays/prune/kustomization.yaml @@ -3,10 +3,8 @@ kind: Kustomization namespace: node-feature-discovery -bases: -- ../../base/rbac - resources: +- ../../base/rbac - namespace.yaml - master-job.yaml diff --git a/deployment/overlays/topologyupdater/kustomization.yaml b/deployment/overlays/topologyupdater/kustomization.yaml index 964f990d0d..e001d62ad6 100644 --- a/deployment/overlays/topologyupdater/kustomization.yaml +++ b/deployment/overlays/topologyupdater/kustomization.yaml @@ -3,14 +3,12 @@ kind: Kustomization namespace: node-feature-discovery -bases: +resources: - ../../base/rbac-topologyupdater - ../../base/rbac-topology-gc - ../../base/noderesourcetopologies-crd - ../../base/topologyupdater-daemonset - ../../base/topology-gc - -resources: - namespace.yaml components: