Skip to content

Commit

Permalink
kata-deploy: fix deprecations on kustomization files
Browse files Browse the repository at this point in the history
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 <wainersm@redhat.com>
  • Loading branch information
wainersm committed Nov 1, 2023
1 parent 53cda12 commit 630ca2e
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 20 deletions.
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- kata-cleanup.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- kata-deploy.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions tools/packaging/kata-deploy/kata-rbac/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- kata-rbac.yaml

0 comments on commit 630ca2e

Please sign in to comment.