From 2a0ff77a5cd7fe4e7a899aa5f868536bb92ce507 Mon Sep 17 00:00:00 2001 From: Romain Arnaud Date: Wed, 26 Apr 2023 12:20:29 -0400 Subject: [PATCH] Update kustomization files to latest standard This removes deprecation warning when applying kustomize to the files Signed-off-by: Romain Arnaud --- config/components/local-db/kustomization.yaml | 8 ++++++-- release/kustomization.yaml | 12 ++++++++---- test/e2e/kustomize/kustomization.yaml | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/config/components/local-db/kustomization.yaml b/config/components/local-db/kustomization.yaml index 88ad73f90..8cf5f408c 100644 --- a/config/components/local-db/kustomization.yaml +++ b/config/components/local-db/kustomization.yaml @@ -22,5 +22,9 @@ kind: Component resources: - 201-sql-deployment.yaml -patchesStrategicMerge: -- api.yaml +patches: +- target: + kind: Deployment + name: api + namespace: tekton-pipelines + path: api.yaml diff --git a/release/kustomization.yaml b/release/kustomization.yaml index 08ece7e4a..305191f3c 100644 --- a/release/kustomization.yaml +++ b/release/kustomization.yaml @@ -1,6 +1,10 @@ -bases: - - ../config/overlays/default-local-db -commonLabels: # Leave this field as an environment variable - this is templated out during # the release process to label all resources with the proper version. - app.kubernetes.io/version: devel +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../config/overlays/default-local-db +labels: +- includeSelectors: true + pairs: + app.kubernetes.io/version: devel diff --git a/test/e2e/kustomize/kustomization.yaml b/test/e2e/kustomize/kustomization.yaml index ac904d15e..2e51cd7d8 100644 --- a/test/e2e/kustomize/kustomization.yaml +++ b/test/e2e/kustomize/kustomization.yaml @@ -16,7 +16,7 @@ resources: - ../../../config/overlays/default-local-db - rbac.yaml -patchesJson6902: +patches: - target: group: apps version: v1