Add -B flag for opting out of deprecated bridge components

[#129898399]

Signed-off-by: Anoop Gopalakrishnan <agopalakrishnan@pivotal.io>

docs/manifest-generation.md

@@ -23,6 +23,7 @@ This document is for describing options to Diego manifest generation.
     -b                  Opt into using capi-release for bridge components.
     -d <voldriver-path> Path to voldriver stub file.
     -N <netman-path>    Path to netman stub file.
+    -B                  Opt out of deprecated CC bridge components.
     -L                  Opt into using garden-linux-release for cells. (DEPRECATED)
 
 #### EXAMPLE:
@@ -138,6 +139,14 @@ volman_overrides:
 The optional -N flag is used to specify the path for the [netman](https://github.com/cloudfoundry-incubator/netman-release) stub file.
 Netman requires Garden-runC, therefore the -g flag must also be set.
 
+##### **Experimental** -B Opt out of deprecated CC bridge components
+
+The optional flag -B will disable deprecated CC bridge components. At the
+moment those components are NSync and Stager. Those components are now part of
+the Cloud Controller. Keep in mind that in order to use this flag and still
+have CF working properly you will need to first enable this feature in
+cf-release via Cloud Controller properties.
+
 ## diego-release/scripts/generate-windows-cell-deployment-manifest
 
 #### SYNOPSIS:

manifest-generation/diego.yml

@@ -802,6 +802,19 @@ base_releases:
     version: (( release_versions.cflinuxfs2-rootfs || "latest" ))
 
 release_versions: (( merge || nil ))
+default_bridge_jobs:
+  - name: consul_agent
+    release: cf
+  - name: stager
+    release: (( bridge_overrides.job_release || "cf" ))
+  - name: nsync
+    release: (( bridge_overrides.job_release || "cf" ))
+  - name: tps
+    release: (( bridge_overrides.job_release || "cf" ))
+  - name: cc_uploader
+    release: (( bridge_overrides.job_release || "cf" ))
+  - name: metron_agent
+    release: cf
 
 base_job_templates:
   access:
@@ -824,19 +837,7 @@ base_job_templates:
       release: cf
     - name: cfdot
       release: diego
-  cc_bridge:
-    - name: consul_agent
-      release: cf
-    - name: stager
-      release: (( bridge_overrides.job_release || "cf" ))
-    - name: nsync
-      release: (( bridge_overrides.job_release || "cf" ))
-    - name: tps
-      release: (( bridge_overrides.job_release || "cf" ))
-    - name: cc_uploader
-      release: (( bridge_overrides.job_release || "cf" ))
-    - name: metron_agent
-      release: cf
+  cc_bridge: (( merge || default_bridge_jobs ))
   cell:
     - name: consul_agent
       release: cf

manifest-generation/disable-deprecated-bridge-jobs.yml

@@ -0,0 +1,10 @@
+base_job_templates:
+  cc_bridge:
+    - name: consul_agent
+      release: cf
+    - name: tps
+      release: (( bridge_overrides.job_release || "cf" ))
+    - name: cc_uploader
+      release: (( bridge_overrides.job_release || "cf" ))
+    - name: metron_agent
+      release: cf

scripts/generate-deployment-manifest

@@ -25,6 +25,7 @@ OPTIONAL ARGUMENTS:
     -b                  Opt into using capi-release for bridge components.
     -d <voldriver-path> Path to voldriver stub file.
     -N <netman-path>    Path to netman stub file
+    -B                  Opt out of deprecated CC bridge components.
     -L                  Opt into using garden-linux-release for cells. (DEPRECATED)
 
 EXAMPLE:
@@ -45,8 +46,9 @@ EOF
 base_releases="${manifest_generation}/base-releases.yml"
 garden_properties=""
 bridge_properties=""
+bridge_jobs=""
 
-while getopts "c:i:p:n:k:v:s:d:N:krbgxL" opt; do
+while getopts "c:i:p:n:k:v:s:d:N:krbgxLB" opt; do
   case $opt in
     c)
       cf_deployment_manifest=$OPTARG
@@ -92,6 +94,9 @@ while getopts "c:i:p:n:k:v:s:d:N:krbgxL" opt; do
     x)
       bbs_properties="${manifest_generation}/bbs-overrides-no-etcd.yml"
       ;;
+    B)
+      bridge_jobs="${manifest_generation}/disable-deprecated-bridge-jobs.yml";
+      ;;
     *)
       echo "Unknown arguments"
       usage
@@ -196,6 +201,7 @@ spiff merge \
   ${instance_counts} \
   ${sql_settings} \
   ${voldriver_settings} \
+  ${bridge_jobs} \
   ${tmpdir}/netman-merged.yml \
   ${iaas_settings} \
   ${tmpdir}/config-from-cf.yml \