Skip to content

Commit 6ba17b3

Browse files
committed
updates kustomization files in test/e2e/data folder
1 parent 31d07f2 commit 6ba17b3

File tree

7 files changed

+57
-43
lines changed

7 files changed

+57
-43
lines changed
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
bases:
1+
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
25
- ../bases/cluster-with-kcp.yaml
36
- ../bases/md.yaml
47
- mhc.yaml
@@ -7,7 +10,6 @@ bases:
710
- ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
811
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
912
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
10-
11-
patchesStrategicMerge:
12-
- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
13-
- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
13+
patches:
14+
- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
15+
- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
bases:
1+
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
25
- ../bases/cluster-with-kcp.yaml
36
- ../bases/md.yaml
47
- ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml
58
- ../../../../../../templates/addons/cluster-api-helm/calico.yaml
69
- ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
710
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
811
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
9-
10-
patchesStrategicMerge:
11-
- ./cluster-with-kcp.yaml
12-
- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
13-
- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
14-
- ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
12+
patches:
13+
- path: ./cluster-with-kcp.yaml
14+
- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
15+
- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
16+
- path: ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml

test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool/kustomization.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ resources:
77
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
88
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
99

10-
patchesStrategicMerge:
11-
- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
12-
- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
13-
- ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
10+
apiVersion: kustomize.config.k8s.io/v1beta1
11+
kind: Kustomization
12+
patches:
13+
- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
14+
- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
15+
- path: ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
bases:
1+
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
25
- ../bases/cluster-with-kcp.yaml
36
- ../bases/md.yaml
47
- mhc.yaml
@@ -7,9 +10,8 @@ bases:
710
- ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
811
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
912
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
10-
11-
patchesStrategicMerge:
12-
- ./md.yaml
13-
- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
14-
- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
15-
- ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
13+
patches:
14+
- path: ./md.yaml
15+
- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
16+
- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
17+
- path: ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
bases:
1+
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
25
- ../bases/cluster-with-kcp.yaml
36
- ../bases/md.yaml
47
- ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml
58
- ../../../../../../templates/addons/cluster-api-helm/calico.yaml
69
- ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
710
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
811
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
9-
10-
patchesStrategicMerge:
11-
- ./md.yaml
12-
- ./cluster-with-kcp.yaml
13-
- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
14-
- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
15-
- ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
12+
patches:
13+
- path: ./md.yaml
14+
- path: ./cluster-with-kcp.yaml
15+
- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
16+
- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
17+
- path: ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
resources:
2-
- ../bases/cluster-with-kcp.yaml
3-
- ../bases/md.yaml
4-
- ../bases/mp.yaml
5-
- ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml
2+
- ../bases/cluster-with-kcp.yaml
3+
- ../bases/md.yaml
4+
- ../bases/mp.yaml
5+
- ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml
66

7-
patchesStrategicMerge:
8-
- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
7+
apiVersion: kustomize.config.k8s.io/v1beta1
8+
kind: Kustomization
9+
patches:
10+
- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
bases:
1+
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
25
- ../bases/cluster-with-kcp.yaml
36
- ../bases/md.yaml
47
- ../../../../../../templates/azure-cluster-identity/azure-cluster-identity.yaml
58
- ../../../../../../templates/addons/cluster-api-helm/calico.yaml
69
- ../../../../../../templates/addons/cluster-api-helm/azuredisk-csi-driver.yaml
710
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure.yaml
811
- ../../../../../../templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml
9-
10-
patchesStrategicMerge:
11-
- ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
12-
- ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
13-
- ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml
12+
patches:
13+
- path: ../../../../../../templates/azure-cluster-identity/azurecluster-identity-ref.yaml
14+
- path: ../../../../../../templates/test/ci/patches/cluster-label-calico.yaml
15+
- path: ../../../../../../templates/test/ci/patches/cluster-label-cloud-provider-azure.yaml

0 commit comments

Comments
 (0)