Skip to content

Commit

Permalink
Reorder kustomization patches to keep consistent ordering between envs (
Browse files Browse the repository at this point in the history
#1944)

Summary: Reorder kustomization patches to keep consistent ordering
between envs

This reordering was introduced in
#1938. Note how the testing
performed on that PR required looking at how the yaml was reordered for
a few cases. This change fixes that reordering.

Relevant Issues: N/A

Type of change: /kind cleanup

Test Plan: Verified with `kustomize build k8s/cloud/prod` and `kustomize
build k8s/cloud/testing` that the yaml before #1938 and after this fix
match exactly
  • Loading branch information
ddelnano authored Jun 7, 2024
1 parent 9453e51 commit ac4d4e3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion k8s/cloud/prod/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ resources:
- ../overlays/exposed_services_gclb
- ../overlays/plugin_job
patches:
- path: auth_deployment.yaml
- path: db_sidecar.yaml
target:
kind: Deployment
Expand All @@ -50,7 +51,6 @@ patches:
- path: script_bundles_config.yaml
- path: scriptmgr_config.yaml
- path: proxy_envoy.yaml
- path: auth_deployment.yaml
labels:
- includeSelectors: true
pairs:
Expand Down
2 changes: 1 addition & 1 deletion k8s/cloud/testing/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ resources:
- ../overlays/exposed_services_gclb
- ../overlays/plugin_job
patches:
- path: auth_deployment.yaml
- path: db_sidecar.yaml
target:
kind: Deployment
Expand All @@ -42,4 +43,3 @@ patches:
- path: cloud_ingress_ip.yaml
- path: script_bundles_config.yaml
- path: proxy_envoy.yaml
- path: auth_deployment.yaml

0 comments on commit ac4d4e3

Please sign in to comment.