From 2c71bdd93fcee760d9d5872179570deca48fc453 Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Fri, 26 Apr 2024 18:12:20 +0000 Subject: [PATCH] address review comments --- templates/flavors/dual-stack/kustomization.yaml | 2 +- templates/flavors/vpcless/deleteLinodeVPC.yaml | 5 ----- templates/flavors/vpcless/kustomization.yaml | 9 ++++++++- 3 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 templates/flavors/vpcless/deleteLinodeVPC.yaml diff --git a/templates/flavors/dual-stack/kustomization.yaml b/templates/flavors/dual-stack/kustomization.yaml index 5ba4d119c..f98fa57f3 100644 --- a/templates/flavors/dual-stack/kustomization.yaml +++ b/templates/flavors/dual-stack/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../default + - ../vpcless patches: - target: diff --git a/templates/flavors/vpcless/deleteLinodeVPC.yaml b/templates/flavors/vpcless/deleteLinodeVPC.yaml deleted file mode 100644 index b0817885b..000000000 --- a/templates/flavors/vpcless/deleteLinodeVPC.yaml +++ /dev/null @@ -1,5 +0,0 @@ -$patch: delete -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 -kind: LinodeVPC -metadata: - name: ${VPC_NAME:=${CLUSTER_NAME}} diff --git a/templates/flavors/vpcless/kustomization.yaml b/templates/flavors/vpcless/kustomization.yaml index d2ada4a3e..cb35eb398 100644 --- a/templates/flavors/vpcless/kustomization.yaml +++ b/templates/flavors/vpcless/kustomization.yaml @@ -4,7 +4,14 @@ resources: - ../default patches: - - path: deleteLinodeVPC.yaml + - target: + kind: LinodeVPC + patch: |- + $patch: delete + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 + kind: LinodeVPC + metadata: + name: ${VPC_NAME:=${CLUSTER_NAME}} - target: group: infrastructure.cluster.x-k8s.io version: v1alpha1