-
Notifications
You must be signed in to change notification settings - Fork 253
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 #1735 from Nordix/mquhuy/fix-kustomize-syntax
✨ Use kustomize new syntax for patches
- Loading branch information
Showing
26 changed files
with
102 additions
and
79 deletions.
There are no files selected for viewing
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
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
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
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: | ||
| - cluster-template.yaml |
7 changes: 4 additions & 3 deletions
7
kustomize/v1alpha5/external-cloud-provider/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,6 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch-ccm.yaml | ||
| patches: | ||
| - path: patch-ccm.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,6 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch-without-lb.yaml | ||
| patches: | ||
| - path: patch-without-lb.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: | ||
| - cluster-template.yaml |
9 changes: 5 additions & 4 deletions
9
kustomize/v1alpha6/external-cloud-provider-flatcar/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,6 +1,7 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch-ccm.yaml | ||
| - patch-flatcar.yaml | ||
| patches: | ||
| - path: patch-ccm.yaml | ||
| - path: patch-flatcar.yaml |
7 changes: 4 additions & 3 deletions
7
kustomize/v1alpha6/external-cloud-provider/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,6 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch-ccm.yaml | ||
| patches: | ||
| - path: patch-ccm.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,6 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch-flatcar.yaml | ||
| patches: | ||
| - path: patch-flatcar.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,6 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch-without-lb.yaml | ||
| patches: | ||
| - path: patch-without-lb.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: | ||
| - cluster-template.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,6 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch-flatcar.yaml | ||
| patches: | ||
| - path: patch-flatcar.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,6 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patchesStrategicMerge: | ||
| - patch-without-lb.yaml | ||
| patches: | ||
| - path: patch-without-lb.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
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
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
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,5 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
| - mhc.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,7 +1,8 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
| - mhc.yaml | ||
|
|
||
| patchesStrategicMerge: | ||
| - md.yaml | ||
| patches: | ||
| - path: md.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,21 +1,22 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patches: | ||
| - target: | ||
| - path: patch-control-plane.yaml | ||
| target: | ||
| kind: OpenStackCluster | ||
| name: \${CLUSTER_NAME} | ||
| path: patch-control-plane.yaml | ||
| - target: | ||
| - path: patch-machine-deployment.yaml | ||
| target: | ||
| kind: MachineDeployment | ||
| name: \${CLUSTER_NAME}-md-0 | ||
| path: patch-machine-deployment.yaml | ||
| - target: | ||
| - path: patch-machine-template-control-plane.yaml | ||
| target: | ||
| kind: OpenStackMachineTemplate | ||
| name: \${CLUSTER_NAME}-control-plane | ||
| path: patch-machine-template-control-plane.yaml | ||
| - target: | ||
| - path: patch-machine-template-worker.yaml | ||
| target: | ||
| kind: OpenStackMachineTemplate | ||
| name: \${CLUSTER_NAME}-md-0 | ||
| path: patch-machine-template-worker.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,8 +1,9 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patches: | ||
| - target: | ||
| - path: patch-machine-template-networks.yaml | ||
| target: | ||
| kind: OpenStackMachineTemplate | ||
| path: patch-machine-template-networks.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,14 +1,13 @@ | ||
| # Modifications to release templates for clusterctl upgrade scenarios | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1alpha1 | ||
| kind: Component | ||
|
|
||
| patches: | ||
| - target: | ||
| - path: ci-hack-kcp.yaml | ||
| target: | ||
| kind: KubeadmControlPlane | ||
| name: \${CLUSTER_NAME}-control-plane | ||
| path: ci-hack-kcp.yaml | ||
| - target: | ||
| - path: ci-hack-kct.yaml | ||
| target: | ||
| kind: KubeadmConfigTemplate | ||
| name: \${CLUSTER_NAME}-md-0 | ||
| path: ci-hack-kct.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
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
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,17 +1,18 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../default | ||
|
|
||
| patches: | ||
| - target: | ||
| - path: patch-cluster.yaml | ||
| target: | ||
| kind: OpenStackCluster | ||
| name: \${CLUSTER_NAME} | ||
| path: patch-cluster.yaml | ||
| - target: | ||
| - path: patch-machine-template-control-plane.yaml | ||
| target: | ||
| kind: OpenStackMachineTemplate | ||
| name: \${CLUSTER_NAME}-control-plane | ||
| path: patch-machine-template-control-plane.yaml | ||
| - target: | ||
| - path: patch-machine-template-worker.yaml | ||
| target: | ||
| kind: OpenStackMachineTemplate | ||
| name: \${CLUSTER_NAME}-md-0 | ||
| path: patch-machine-template-worker.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