Make default_app_lifecycle configurable (#541)

Author: sethboyles

jobs/cloud_controller_ng/spec

@@ -144,6 +144,7 @@ provides:
   - cc.default_app_ssh_access
   - cc.default_health_check_timeout
   - cc.default_stack
+  - cc.default_app_lifecycle
   - cc.disable_private_domain_cross_space_context_path_route_sharing
   - cc.droplets.blobstore_type
   - cc.droplets.cdn.key_pair_id
@@ -851,6 +852,10 @@ properties:
     default: false
     description: "Disable external (i.e. git) buildpacks? (Admin buildpacks and system buildpacks only.)"
 
+  cc.default_app_lifecycle:
+    default: buildpack
+    decription: "The default buildpack lifecycle for apps. Valid values are 'buildpack' (Classic Buildpacks) and 'cnb' (Cloud Native Buildpacks)"
+
   cc.broker_client_timeout_seconds:
     default: 60
     description: "For requests to service brokers, this is the HTTP (open and read) timeout setting."

jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb

@@ -578,7 +578,7 @@ internal_route_vip_range: <%= internal_vip_range %>
 
 threadpool_size: <%= p("cc.experimental.thin_server.thread_pool_size") %>
 
-default_app_lifecycle: buildpack
+default_app_lifecycle: <%= p("cc.default_app_lifecycle") %>
 custom_metric_tag_prefix_list: <%= p("cc.custom_metric_tag_prefix_list") %>
 update_metric_tags_on_rename: <%= p("cc.update_metric_tags_on_rename") %>
 

jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb

@@ -363,6 +363,6 @@ app_log_revision: <%= link("cloud_controller_internal").p("cc.app_log_revision")
 
 publish_metrics: <%= p("cc.publish_metrics") %>
 prometheus_port: <%= p("cc.prometheus_port") %>
-
+default_app_lifecycle: <%= link("cloud_controller_internal").p("cc.default_app_lifecycle") %>
 directories:
-  tmpdir: <%= p("cc.directories.tmpdir") %>
+  tmpdir: <%= p("cc.directories.tmpdir") %>

spec/cloud_controller_ng/cloud_controller_ng_spec.rb

@@ -962,6 +962,37 @@ module Test
               end
             end
           end
+
+          describe 'default_app_lifecycle' do
+            context 'when it is not set' do
+              it 'defaults to buildpack' do
+                template_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
+                expect(template_hash['default_app_lifecycle']).to eq('buildpack')
+              end
+            end
+
+            context 'when it is set to buidpack' do
+              before do
+                merged_manifest_properties['cc']['default_app_lifecycle'] = 'buidpack'
+              end
+
+              it 'renders it as buidpack' do
+                template_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
+                expect(template_hash['default_app_lifecycle']).to eq('buidpack')
+              end
+            end
+
+            context 'when it is set to cnb' do
+              before do
+                merged_manifest_properties['cc']['default_app_lifecycle'] = 'cnb'
+              end
+
+              it 'renders it as cnb' do
+                template_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links))
+                expect(template_hash['default_app_lifecycle']).to eq('cnb')
+              end
+            end
+          end
         end
       end
     end

spec/cloud_controller_worker/cloud_controller_worker_spec.rb

@@ -85,7 +85,8 @@ module Test
               'temporary_enable_v2' => false,
               'packages' => {
                 'max_valid_packages_stored' => 5
-              }
+              },
+              'default_app_lifecycle' => 'cnb'
             }
           }
         end
@@ -362,6 +363,13 @@ module Test
             end
           end
         end
+
+        describe 'default_app_lifecycle' do
+          it 'is set from cloud_controller_internal_link' do
+            template_hash = YAML.safe_load(template.render(manifest_properties, consumes: links))
+            expect(template_hash['default_app_lifecycle']).to eq('cnb')
+          end
+        end
       end
     end
   end