Skip to content

Commit e09e669

Browse files
committed
fix: updates to kustomization.yaml after v5
After upgrading to kustomization v5 we need to make some updates to our kustomization files. Signed-off-by: Richard Case <[email protected]>
1 parent b812b70 commit e09e669

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed
Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
# default template enables external ccm and csi
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
24
resources:
3-
- ../base
4-
- machine-deployment.yaml
5-
- ../addons/cni/resources/cni-resource-set.yaml
6-
- ../addons/ccm/resources/ccm-resource-set.yaml
7-
- ../addons/csi/resources/csi-resource-set.yaml
8-
patchesStrategicMerge:
9-
- ../addons/cni/patches/cluster-cni.yaml
10-
- ../addons/ccm/patches/external-cloud-provider.yaml
11-
- ../addons/csi/patches/external-csi-provider.yaml
5+
- ../base
6+
- machine-deployment.yaml
7+
- ../addons/cni/resources/cni-resource-set.yaml
8+
- ../addons/ccm/resources/ccm-resource-set.yaml
9+
- ../addons/csi/resources/csi-resource-set.yaml
1210
configMapGenerator:
13-
- name: cloud-controller-manager-addon
14-
files:
15-
- ../addons/ccm/data/aws-ccm-external.yaml
16-
- name: aws-ebs-csi-driver-addon
17-
files:
18-
- ../addons/csi/data/aws-ebs-csi-external.yaml
11+
- files:
12+
- ../addons/ccm/data/aws-ccm-external.yaml
13+
name: cloud-controller-manager-addon
14+
- files:
15+
- ../addons/csi/data/aws-ebs-csi-external.yaml
16+
name: aws-ebs-csi-driver-addon
1917
generatorOptions:
18+
annotations:
19+
note: generated
2020
disableNameSuffixHash: true
2121
labels:
2222
type: generated
23-
annotations:
24-
note: generated
25-
23+
patches:
24+
- path: ../addons/cni/patches/cluster-cni.yaml
25+
- path: ../addons/ccm/patches/external-cloud-provider.yaml
26+
- path: ../addons/csi/patches/external-csi-provider.yaml

test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/external-securitygroups/kustomization.yaml

Whitespace-only changes.

0 commit comments

Comments
 (0)