Merge branch 'feature/ignore-prometheus-metrics-not-present' into 'master'

Ignore non-existing metrics when uninstalling Prometheus

See merge request gitlab-org/gitlab!18020

app/models/clusters/applications/prometheus.rb

@@ -112,7 +112,12 @@ module Clusters
       def delete_knative_istio_metrics
         return [] unless cluster.application_knative_available?
 
-        [Gitlab::Kubernetes::KubectlCmd.delete("-f", Clusters::Applications::Knative::METRICS_CONFIG)]
+        [
+          Gitlab::Kubernetes::KubectlCmd.delete(
+            "-f", Clusters::Applications::Knative::METRICS_CONFIG,
+            "--ignore-not-found"
+          )
+        ]
       end
     end
   end

changelogs/unreleased/feature-ignore-prometheus-metrics-not-present.yml

+---
+title: Avoid knative and prometheus uninstall race condition
+merge_request: 18020
+author:
+type: changed

spec/models/clusters/applications/prometheus_spec.rb

@@ -175,6 +175,18 @@ describe Clusters::Applications::Prometheus do
       expect(subject).to be_rbac
     end
 
+    describe '#predelete' do
+      let(:knative) { create(:clusters_applications_knative, :updated ) }
+      let(:prometheus) { create(:clusters_applications_prometheus, cluster: knative.cluster) }
+
+      subject { prometheus.uninstall_command.predelete }
+
+      it 'deletes knative metrics' do
+        metrics_config = Clusters::Applications::Knative::METRICS_CONFIG
+        is_expected.to include("kubectl delete -f #{metrics_config} --ignore-not-found")
+      end
+    end
+
     context 'on a non rbac enabled cluster' do
       before do
         prometheus.cluster.platform_kubernetes.abac!