From abc2fcd88f068e8269e02c72fd95e4b22c9ad7e3 Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Fri, 20 Oct 2023 10:42:57 -0300 Subject: [PATCH] kata-deploy: fix deprecations on kustomization files By running `kustomize edit fix` on those files they have changed deprecated instructions ('bases' and 'patchesStrategicMerge') as well as 'apiVersion' and 'kind' were added. Fixes #8268 Signed-off-by: Wainer dos Santos Moschetta --- .../kata-deploy/kata-cleanup/base/kustomization.yaml | 2 ++ .../kata-cleanup/overlays/k3s/kustomization.yaml | 10 ++++++---- .../kata-cleanup/overlays/rke2/kustomization.yaml | 10 ++++++---- .../kata-deploy/kata-deploy/base/kustomization.yaml | 2 ++ .../kata-deploy/overlays/k0s/kustomization.yaml | 10 ++++++---- .../kata-deploy/overlays/k3s/kustomization.yaml | 10 ++++++---- .../kata-deploy/overlays/rke2/kustomization.yaml | 10 ++++++---- .../kata-deploy/overlays/stable/kustomization.yaml | 4 +++- .../kata-deploy/kata-rbac/base/kustomization.yaml | 2 ++ 9 files changed, 39 insertions(+), 21 deletions(-) diff --git a/tools/packaging/kata-deploy/kata-cleanup/base/kustomization.yaml b/tools/packaging/kata-deploy/kata-cleanup/base/kustomization.yaml index 6c548a0441..df904e3588 100644 --- a/tools/packaging/kata-deploy/kata-cleanup/base/kustomization.yaml +++ b/tools/packaging/kata-deploy/kata-cleanup/base/kustomization.yaml @@ -1,2 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - kata-cleanup.yaml diff --git a/tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/kustomization.yaml b/tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/kustomization.yaml index 2e37b842b7..4331185514 100644 --- a/tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/kustomization.yaml +++ b/tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/kustomization.yaml @@ -1,5 +1,7 @@ -bases: -- ../../base -patchesStrategicMerge: -- mount_k3s_conf.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base +patches: +- path: mount_k3s_conf.yaml diff --git a/tools/packaging/kata-deploy/kata-cleanup/overlays/rke2/kustomization.yaml b/tools/packaging/kata-deploy/kata-cleanup/overlays/rke2/kustomization.yaml index 90dbe7bf8e..615cd0305f 100644 --- a/tools/packaging/kata-deploy/kata-cleanup/overlays/rke2/kustomization.yaml +++ b/tools/packaging/kata-deploy/kata-cleanup/overlays/rke2/kustomization.yaml @@ -1,5 +1,7 @@ -bases: -- ../../base -patchesStrategicMerge: -- mount_rke2_conf.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base +patches: +- path: mount_rke2_conf.yaml diff --git a/tools/packaging/kata-deploy/kata-deploy/base/kustomization.yaml b/tools/packaging/kata-deploy/kata-deploy/base/kustomization.yaml index 6b6d8e4cfb..6266718bac 100644 --- a/tools/packaging/kata-deploy/kata-deploy/base/kustomization.yaml +++ b/tools/packaging/kata-deploy/kata-deploy/base/kustomization.yaml @@ -1,2 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - kata-deploy.yaml diff --git a/tools/packaging/kata-deploy/kata-deploy/overlays/k0s/kustomization.yaml b/tools/packaging/kata-deploy/kata-deploy/overlays/k0s/kustomization.yaml index 14904f5601..041feda2fb 100644 --- a/tools/packaging/kata-deploy/kata-deploy/overlays/k0s/kustomization.yaml +++ b/tools/packaging/kata-deploy/kata-deploy/overlays/k0s/kustomization.yaml @@ -1,5 +1,7 @@ -bases: -- ../../base -patchesStrategicMerge: -- mount_k0s_conf.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base +patches: +- path: mount_k0s_conf.yaml diff --git a/tools/packaging/kata-deploy/kata-deploy/overlays/k3s/kustomization.yaml b/tools/packaging/kata-deploy/kata-deploy/overlays/k3s/kustomization.yaml index 2e37b842b7..4331185514 100644 --- a/tools/packaging/kata-deploy/kata-deploy/overlays/k3s/kustomization.yaml +++ b/tools/packaging/kata-deploy/kata-deploy/overlays/k3s/kustomization.yaml @@ -1,5 +1,7 @@ -bases: -- ../../base -patchesStrategicMerge: -- mount_k3s_conf.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base +patches: +- path: mount_k3s_conf.yaml diff --git a/tools/packaging/kata-deploy/kata-deploy/overlays/rke2/kustomization.yaml b/tools/packaging/kata-deploy/kata-deploy/overlays/rke2/kustomization.yaml index 90dbe7bf8e..615cd0305f 100644 --- a/tools/packaging/kata-deploy/kata-deploy/overlays/rke2/kustomization.yaml +++ b/tools/packaging/kata-deploy/kata-deploy/overlays/rke2/kustomization.yaml @@ -1,5 +1,7 @@ -bases: -- ../../base -patchesStrategicMerge: -- mount_rke2_conf.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base +patches: +- path: mount_rke2_conf.yaml diff --git a/tools/packaging/kata-deploy/kata-deploy/overlays/stable/kustomization.yaml b/tools/packaging/kata-deploy/kata-deploy/overlays/stable/kustomization.yaml index ce7a220171..6225193ee5 100644 --- a/tools/packaging/kata-deploy/kata-deploy/overlays/stable/kustomization.yaml +++ b/tools/packaging/kata-deploy/kata-deploy/overlays/stable/kustomization.yaml @@ -1,4 +1,6 @@ -bases: +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: - ../../base images: diff --git a/tools/packaging/kata-deploy/kata-rbac/base/kustomization.yaml b/tools/packaging/kata-deploy/kata-rbac/base/kustomization.yaml index a79f10e850..d58620ec01 100644 --- a/tools/packaging/kata-deploy/kata-rbac/base/kustomization.yaml +++ b/tools/packaging/kata-deploy/kata-rbac/base/kustomization.yaml @@ -1,2 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization resources: - kata-rbac.yaml