-
Notifications
You must be signed in to change notification settings - Fork 10
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 #863 from cloud-gov/platformcell6
Continue to split diego-cells
- Loading branch information
Showing
13 changed files
with
351 additions
and
67 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| # Needed because the isolation segment(s) exist | ||
| # Use distinct vxlan policy links for tenant cells | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=vxlan-policy-agent/provides?/vpa | ||
| value: {as: vpa-tenant} | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=silk-daemon/consumes?/vpa | ||
| value: {from: vpa-tenant} | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=silk-cni/consumes?/vpa | ||
| value: {from: vpa-tenant} | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=vxlan-policy-agent/consumes?/iptables | ||
| value: {from: iptables-tenant} | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=silk-daemon/consumes?/iptables | ||
| value: {from: iptables-tenant} | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=netmon/consumes?/iptables | ||
| value: {from: iptables-tenant} | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=garden/provides?/iptables | ||
| value: {as: iptables-tenant} | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=vxlan-policy-agent/consumes?/cni_config | ||
| value: {from: cni_config_tenant} | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=silk-cni/provides?/cni_config | ||
| value: {as: cni_config_tenant} | ||
|
|
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 |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- | ||
| - type: remove | ||
| path: /instance_groups/name=diego-cell/jobs/name=rep/properties/loggregator/app_metric_exclusion_filter | ||
|
|
||
| - type: remove | ||
| path: /instance_groups/name=diego-cell/jobs/name=route_emitter/properties/loggregator/app_metric_exclusion_filter | ||
|
|
||
| - type: remove | ||
| path: /instance_groups/name=diego-cell/jobs/name=vxlan-policy-agent/properties/loggregator/app_metric_exclusion_filter | ||
|
|
||
|
|
||
| ### This makes sure that absolute-cpu-entitlement is still emitting in addition to newer cpu_entitlement |
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
14 changes: 14 additions & 0 deletions
14
bosh/opsfiles/disable-secure-service-credentials-diego-cell.yml
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 |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # This file exists to remove CredHub Secured Service Credential Delivery which | ||
| # is now on by default in cf-deployment >=4.x. | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=rep/properties/containers/trusted_ca_certificates | ||
| value: | ||
| - ((diego_instance_identity_ca.ca)) | ||
| - ((uaa_ssl.ca)) | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=cflinuxfs4-rootfs-setup/properties/cflinuxfs4-rootfs/trusted_certs | ||
| value: | ||
| - ((diego_instance_identity_ca.ca)) | ||
| - ((uaa_ssl.ca)) |
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 |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=garden/properties/garden/log_level? | ||
| value: error | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=rep/properties/diego/rep/log_level? | ||
| value: error | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=route_emitter/properties/diego/route_emitter/log_level? | ||
| value: error |
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,15 +1,3 @@ | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=garden/properties/garden/log_level? | ||
| value: error | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=rep/properties/diego/rep/log_level? | ||
| value: error | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/jobs/name=route_emitter/properties/diego/route_emitter/log_level? | ||
| value: error | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/security_event_logging?/enabled | ||
| value: true |
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 |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/vm_extensions/- | ||
| value: meta-data-v2 |
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,3 @@ | ||
| - type: replace | ||
| path: /instance_groups/name=diego-cell/vm_extensions/- | ||
| value: meta-data-v2 | ||
| - type: replace | ||
| path: /instance_groups/name=diego-platform-cell/vm_extensions/- | ||
| value: meta-data-v2 |
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