Delete Kpack Image during AppDelete

[#171900207]

Co-authored-by: Aakash Shah <ashah@pivotal.io>
Co-authored-by: Seth Boyles <sboyles@pivotal.io>

Author: Aakash Shah

app/actions/app_delete.rb

@@ -29,6 +29,7 @@ def underlying_errors
 
     def initialize(user_audit_info)
       @user_audit_info = user_audit_info
+      @kpack_client = CloudController::DependencyLocator.instance.kpack_client
     end
 
     def delete(apps, record_event: true)
@@ -51,6 +52,14 @@ def delete(apps, record_event: true)
           app.destroy
         end
         logger.info("Deleted app: #{app.guid}")
+
+        if kubernetes_api_configured?
+          logger.info('Deleting associated kpack image')
+          @kpack_client.delete_image(
+            app.guid,
+            VCAP::CloudController::Config.config.get(:kubernetes, :kpack, :builder_namespace)
+          )
+        end
       end
     end
 
@@ -60,6 +69,10 @@ def delete_without_event(apps)
 
     private
 
+    def kubernetes_api_configured?
+      !!VCAP::CloudController::Config.config.get(:kubernetes, :host_url)
+    end
+
     def record_audit_event(app)
       Repositories::AppEventRepository.new.record_app_delete_request(
         app,

lib/kubernetes/kpack_client.rb

@@ -25,5 +25,11 @@ def update_image(*args)
     rescue Kubeclient::HttpError => e
       raise CloudController::Errors::ApiError.new_from_details('KpackImageError', 'update', e.message)
     end
+
+    def delete_image(name, namespace)
+      @client.delete_image(name, namespace)
+    rescue Kubeclient::HttpError => e
+      raise CloudController::Errors::ApiError.new_from_details('KpackImageError', 'delete', e.message)
+    end
   end
 end

spec/request/organizations_spec.rb

@@ -1111,8 +1111,10 @@ module VCAP::CloudController
         s.add_shared_space(space)
         s
       end
+      let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
 
       before do
+        allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
         AppModel.make(space: space)
         Route.make(space: space)
         org.add_user(associated_user)

spec/unit/actions/app_delete_spec.rb

@@ -319,6 +319,29 @@ module VCAP::CloudController
           end
         end
       end
+
+      context 'when targeting a kubernetes API' do
+        let(:kpack_client) { instance_double(Kubernetes::KpackClient) }
+        let!(:config) do
+          TestConfig.override(
+            kubernetes: {
+                host_url: 'some-kubernetes-host-url',
+                kpack: {
+                  builder_namespace: 'builder-namespace',
+                },
+            },
+          )
+        end
+
+        before do
+          allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
+        end
+
+        it 'deletes the associated kpack Image' do
+          expect(kpack_client).to receive(:delete_image).with(app.guid, 'builder-namespace')
+          app_delete.delete(app_dataset)
+        end
+      end
     end
 
     describe '#delete_without_event' do

spec/unit/controllers/runtime/apps_controller_spec.rb

@@ -1086,9 +1086,11 @@ def update_app
       let(:developer) { make_developer_for_space(process.space) }
       let(:decoded_response) { MultiJson.load(last_response.body) }
       let(:parent_app) { process.app }
+      let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
 
       before do
         set_current_user(developer)
+        allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
       end
 
       def delete_app

spec/unit/lib/kubernetes/kpack_client_spec.rb

@@ -83,4 +83,25 @@
       end
     end
   end
+
+  describe '#delete_image' do
+    let(:kube_client) { double(Kubeclient) }
+    subject(:kpack_client) { Kubernetes::KpackClient.new(kube_client) }
+
+    it 'proxies call to kubernetes client with the same args' do
+      expect(kube_client).to receive(:delete_image).with('resource-name', 'namespace')
+
+      subject.delete_image('resource-name', 'namespace')
+    end
+
+    context 'when there is an error' do
+      it 'raises as an ApiError' do
+        allow(kube_client).to receive(:delete_image).and_raise(Kubeclient::HttpError.new(422, 'foo', 'bar'))
+
+        expect {
+          subject.delete_image('resource-name', 'namespace')
+        }.to raise_error(CloudController::Errors::ApiError)
+      end
+    end
+  end
 end