Merge pull request cloudfoundry#1724 from eirini-forks/fix-task-callback

Fix task completion callback on k8s

[Finishes #173666642]

Author: selzoc

lib/cloud_controller/diego/task_completion_callback_generator.rb

@@ -6,10 +6,15 @@ def initialize(config=Config.config)
       end
 
       def generate(task)
-        schema = 'https'
+        if @config.kubernetes_api_configured?
+          port   = 80
+          schema = 'http'
+        else
+          port   = @config.get(:tls_port)
+          schema = 'https'
+        end
         auth = ''
         host = @config.get(:internal_service_hostname)
-        port = @config.get(:tls_port)
         api_version = 'v4'
 
         path = "/internal/#{api_version}/tasks/#{task.guid}/completed"

spec/unit/lib/cloud_controller/diego/task_completion_callback_generator_spec.rb

@@ -8,10 +8,12 @@ module Diego
 
       describe '#generate' do
         let(:task) { TaskModel.make }
+        let(:kubernetes_config) { nil }
         let(:task_config) do
           {
             internal_service_hostname: 'google.com',
             tls_port:                  '8888',
+            kubernetes:                kubernetes_config,
           }
         end
 
@@ -26,6 +28,20 @@ module Diego
             )
           end
         end
+
+        context 'when kubernetes is configured' do
+          let(:kubernetes_config) do
+            {
+              host_url: 'https://master.default.svc.cluster-domain.example',
+            }
+          end
+
+          it 'configures the callback url with http and relies on Istio for mTLS' do
+            expect(generator.generate(task)).to eq(
+              "http://google.com:80/internal/v4/tasks/#{task.guid}/completed"
+            )
+          end
+        end
       end
     end
   end