-
Notifications
You must be signed in to change notification settings - Fork 27
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 #3529 from alphagov/BC-app-autoscaler-base-manifes…
…t-switch [#184549339] App autoscaler upgrade
- Loading branch information
Showing
26 changed files
with
521 additions
and
107 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
13 changes: 13 additions & 0 deletions
13
manifests/app-autoscaler/diffs/patch_dynamic_policy_test.patch
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,13 @@ | ||
| diff --git a/src/acceptance/app/dynamic_policy_test.go b/src/acceptance/app/dynamic_policy_test.go | ||
| index 1339ff514..ff0a2fe47 100644 | ||
| --- a/src/acceptance/app/dynamic_policy_test.go | ||
| +++ b/src/acceptance/app/dynamic_policy_test.go | ||
| @@ -50,7 +50,7 @@ var _ = Describe("AutoScaler dynamic policy", func() { | ||
|
|
||
| It("should scale out and then back in.", Label(acceptance.LabelSmokeTests), func() { | ||
| By(fmt.Sprintf("Use heap %d mb of heap on app", heapToUse)) | ||
| - CurlAppInstance(cfg, appName, 0, fmt.Sprintf("/memory/%d/5", heapToUse)) | ||
| + CurlAppInstance(cfg, appName, 0, fmt.Sprintf("/memory/%d/5", heapToUse+20)) | ||
|
|
||
| By("wait for scale to 2") | ||
| WaitForNInstancesRunning(appGUID, 2, 5*time.Minute) |
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,9 +1,17 @@ | ||
| --- | ||
|
|
||
| # UPGRADE WARNING! | ||
| # The 11.4.2 release of app-autscaler-release has been patched to fix the acceptance tests. | ||
| # See this issue: https://github.com/cloudfoundry/app-autoscaler-release/issues/2434 | ||
| # The patch file can be found here: | ||
| # paas-cf/manifests/app-autoscaler/diffs/patch_dynamic_policy_test.patch | ||
| # This patch is applied as part of the concourse task. See: | ||
| # concourse/tasks/app-autoscaler-acceptance-tests-run.yml | ||
|
|
||
| - type: replace | ||
| path: /releases/name=app-autoscaler? | ||
| value: | ||
| name: app-autoscaler | ||
| version: "10.0.0" | ||
| url: "https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=10.0.0" | ||
| sha1: "f691986b6f14e5bc1974e8c0b02996e9e2497a61" | ||
| name: "app-autoscaler" | ||
| version: "11.4.2" | ||
| url: "https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=11.4.2" | ||
| sha1: "e3e3c292122acd8f14b825f24051ad4b7330ffd5" |
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
1 change: 1 addition & 0 deletions
1
manifests/app-autoscaler/operations.d/025-add-postgres-variables-UPSTREAM.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 @@ | ||
| ../upstream/operations/add-postgres-variables.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
8 changes: 8 additions & 0 deletions
8
manifests/app-autoscaler/operations.d/033-apiserver-public-endpoint.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,8 @@ | ||
| --- | ||
|
|
||
| # autoscaler.((system_domain)) remains the cf cli autoscaler plugin's | ||
| # default presumed endpoint. | ||
| - type: replace | ||
| path: /instance_groups/name=apiserver/jobs/name=route_registrar/properties/route_registrar/routes/name=api_server/uris | ||
| value: | ||
| - autoscaler.((system_domain)) |
21 changes: 6 additions & 15 deletions
21
manifests/app-autoscaler/operations.d/035-internal-cert-update-mode-converge.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 |
|---|---|---|
| @@ -1,33 +1,24 @@ | ||
| --- | ||
| - type: replace | ||
| path: /variables/name=scalingengine_server/update_mode? | ||
| path: /variables/name=scalingengine_server_cert/update_mode? | ||
| value: converge | ||
|
|
||
| - type: replace | ||
| path: /variables/name=eventgenerator_server/update_mode? | ||
| path: /variables/name=eventgenerator_server_cert/update_mode? | ||
| value: converge | ||
|
|
||
| - type: replace | ||
| path: /variables/name=apiserver_server/update_mode? | ||
| path: /variables/name=apiserver_server_cert/update_mode? | ||
| value: converge | ||
|
|
||
| - type: replace | ||
| path: /variables/name=apiserver_public_server/update_mode? | ||
| path: /variables/name=servicebroker_server_cert/update_mode? | ||
| value: converge | ||
|
|
||
| - type: replace | ||
| path: /variables/name=servicebroker_server/update_mode? | ||
| path: /variables/name=scheduler_server_cert/update_mode? | ||
| value: converge | ||
|
|
||
| - type: replace | ||
| path: /variables/name=servicebroker_public_server/update_mode? | ||
| path: /variables/name=metricsserver_server_cert/update_mode? | ||
| value: converge | ||
|
|
||
| - type: replace | ||
| path: /variables/name=scheduler_server/update_mode? | ||
| value: converge | ||
|
|
||
| - type: replace | ||
| path: /variables/name=postgres_server/update_mode? | ||
| value: converge | ||
|
|
18 changes: 18 additions & 0 deletions
18
manifests/app-autoscaler/operations.d/036-set-password-length-72.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,18 @@ | ||
| --- | ||
| # https://github.com/cloudfoundry/app-autoscaler-release/pull/1295 | ||
| - type: replace | ||
| path: /variables/name=service_broker_password/options/length? | ||
| value: 72 | ||
|
|
||
| - type: replace | ||
| path: /variables/name=service_broker_password/update_mode? | ||
| value: converge | ||
|
|
||
| - type: replace | ||
| path: /variables/name=service_broker_password_blue/options/length? | ||
| value: 72 | ||
|
|
||
| - type: replace | ||
| path: /variables/name=service_broker_password_blue/update_mode? | ||
| value: converge | ||
|
|
2 changes: 1 addition & 1 deletion
2
manifests/app-autoscaler/operations.d/050-enable-nats-tls-UPSTREAM.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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| ../upstream/example/operation/enable-nats-tls.yml | ||
| ../upstream/operations/enable-nats-tls.yml |
24 changes: 20 additions & 4 deletions
24
manifests/app-autoscaler/operations.d/051-enable-nats-tls-fix-deployment-name.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 |
|---|---|---|
| @@ -1,16 +1,32 @@ | ||
| --- | ||
| - type: replace | ||
| path: /instance_groups/name=asactors/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| path: /instance_groups/name=scalingengine/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| value: ((deploy_env)) | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=asapi/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| path: /instance_groups/name=scheduler/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| value: ((deploy_env)) | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=asnozzle/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| path: /instance_groups/name=operator/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| value: ((deploy_env)) | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=asmetrics/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| path: /instance_groups/name=apiserver/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| value: ((deploy_env)) | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=metricsforwarder/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| value: ((deploy_env)) | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=metricsgateway/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| value: ((deploy_env)) | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=eventgenerator/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| value: ((deploy_env)) | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=metricsserver/jobs/name=route_registrar/consumes/nats-tls/deployment? | ||
| value: ((deploy_env)) |
28 changes: 24 additions & 4 deletions
28
manifests/app-autoscaler/operations.d/100-update-networks.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 |
|---|---|---|
| @@ -1,21 +1,41 @@ | ||
| --- | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=asactors/networks | ||
| path: /instance_groups/name=scalingengine/networks | ||
| value: | ||
| - name: cf | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=asmetrics/networks | ||
| path: /instance_groups/name=scheduler/networks | ||
| value: | ||
| - name: cf | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=asapi/networks | ||
| path: /instance_groups/name=operator/networks | ||
| value: | ||
| - name: cf | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=asnozzle/networks | ||
| path: /instance_groups/name=metricsforwarder/networks | ||
| value: | ||
| - name: cf | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=metricsserver/networks | ||
| value: | ||
| - name: cf | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=eventgenerator/networks | ||
| value: | ||
| - name: cf | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=apiserver/networks | ||
| value: | ||
| - name: cf | ||
|
|
||
| - type: replace | ||
| path: /instance_groups/name=metricsgateway/networks | ||
| value: | ||
| - name: cf |
Oops, something went wrong.