-
Notifications
You must be signed in to change notification settings - Fork 996
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8269 from wainersm/kata-deploy_deprecated
kata-deploy: fix deprecations on kustomization files
- Loading branch information
Showing
9 changed files
with
39 additions
and
21 deletions.
There are no files selected for viewing
2 changes: 2 additions & 0 deletions
2
tools/packaging/kata-deploy/kata-cleanup/base/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
10 changes: 6 additions & 4 deletions
10
tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
10 changes: 6 additions & 4 deletions
10
tools/packaging/kata-deploy/kata-cleanup/overlays/rke2/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
2
tools/packaging/kata-deploy/kata-deploy/base/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
10 changes: 6 additions & 4 deletions
10
tools/packaging/kata-deploy/kata-deploy/overlays/k0s/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
10 changes: 6 additions & 4 deletions
10
tools/packaging/kata-deploy/kata-deploy/overlays/k3s/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
10 changes: 6 additions & 4 deletions
10
tools/packaging/kata-deploy/kata-deploy/overlays/rke2/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
4 changes: 3 additions & 1 deletion
4
tools/packaging/kata-deploy/kata-deploy/overlays/stable/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| bases: | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../../base | ||
|
|
||
| images: | ||
|
|
||
2 changes: 2 additions & 0 deletions
2
tools/packaging/kata-deploy/kata-rbac/base/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |