Skip to content

Commit fea5fbf

Browse files
committed
Use sortOptions/fifo in test/dev templates
1 parent abb5298 commit fea5fbf

File tree

6 files changed

+848
-861
lines changed

6 files changed

+848
-861
lines changed

hack/gen-flavors.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ for name in $(find "${ci_dir}"* -maxdepth 0 -type d -print0 | xargs -0 -I {} bas
3939
done
4040

4141
for name in $(find "${dev_dir}"* -maxdepth 0 -type d -print0 | xargs -0 -I {} basename {} | grep -v patches); do
42-
${KUSTOMIZE} build --load-restrictor LoadRestrictionsNone --reorder none "${dev_dir}${name}" > "${dev_dir}cluster-template-${name}.yaml"
42+
${KUSTOMIZE} build --load-restrictor LoadRestrictionsNone "${dev_dir}${name}" > "${dev_dir}cluster-template-${name}.yaml"
4343
done
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
patches:
4+
- path: opentelemetry/controller-manager-patch.yaml
15
resources:
2-
- ../../config/default
3-
- prometheus
4-
5-
patchesStrategicMerge:
6-
- opentelemetry/controller-manager-patch.yaml
6+
- ../../config/default
7+
- prometheus

templates/test/ci/prow-clusterclass-ci-default/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
sortOptions:
44
order: fifo
5+
namespace: default
56
resources:
67
- ../../../flavors/clusterclass/clusterclass.yaml
78
- ../../../flavors/clusterclass/kubeadm-controlplane-template.yaml

0 commit comments

Comments
 (0)