Make use of Gitlab::Kubernetes

- refactor Knative and Prometheus

3 files changed, 14 insertions, 10 deletions

diff --git a/app/models/clusters/applications/cert_manager.rb b/app/models/clusters/applications/cert_manager.rb
index 2fc1b67dfd2..6bd7473c8ff 100644
--- a/app/models/clusters/applications/cert_manager.rb
+++ b/app/models/clusters/applications/cert_manager.rb
@@ -64,11 +64,15 @@ module Clusters
       end
 
       def delete_private_key
-        "kubectl delete secret -n #{Gitlab::Kubernetes::Helm::NAMESPACE} #{private_key_name} --ignore-not-found" if private_key_name.present?
+        return unless private_key_name.present?
+
+        args = %W(secret -n #{Gitlab::Kubernetes::Helm::NAMESPACE} #{private_key_name} --ignore-not-found)
+
+        Gitlab::Kubernetes::KubectlCmd.delete(*args)
       end
 
       def delete_crd(definition)
-        "kubectl delete crd #{definition} --ignore-not-found"
+        Gitlab::Kubernetes::KubectlCmd.delete("crd", definition, "--ignore-not-found")
       end
 
       def cluster_issuer_file
diff --git a/app/models/clusters/applications/knative.rb b/app/models/clusters/applications/knative.rb
index 5eae23659ae..244fe738396 100644
--- a/app/models/clusters/applications/knative.rb
+++ b/app/models/clusters/applications/knative.rb
@@ -89,7 +89,7 @@ module Clusters
 
       def delete_knative_services
         cluster.kubernetes_namespaces.map do |kubernetes_namespace|
-          "kubectl delete ksvc --all -n #{kubernetes_namespace.namespace}"
+          Gitlab::Kubernetes::KubectlCmd.delete("ksvc", "--all", "-n", kubernetes_namespace.namespace)
         end
       end
 
@@ -99,14 +99,14 @@ module Clusters
 
       def delete_knative_namespaces
         [
-          "kubectl delete --ignore-not-found ns knative-serving",
-          "kubectl delete --ignore-not-found ns knative-build"
+          Gitlab::Kubernetes::KubectlCmd.delete("--ignore-not-found", "ns", "knative-serving"),
+          Gitlab::Kubernetes::KubectlCmd.delete("--ignore-not-found", "ns", "knative-build")
         ]
       end
 
       def delete_knative_and_istio_crds
         api_resources.map do |crd|
-          "kubectl delete --ignore-not-found crd #{crd}"
+          Gitlab::Kubernetes::KubectlCmd.delete("--ignore-not-found", "crd", "#{crd}")
         end
       end
 
@@ -119,13 +119,13 @@ module Clusters
       def install_knative_metrics
         return [] unless cluster.application_prometheus_available?
 
-        ["kubectl apply -f #{METRICS_CONFIG}"]
+        [Gitlab::Kubernetes::KubectlCmd.apply_file(METRICS_CONFIG)]
       end
 
       def delete_knative_istio_metrics
         return [] unless cluster.application_prometheus_available?
 
-        ["kubectl delete --ignore-not-found -f #{METRICS_CONFIG}"]
+        [Gitlab::Kubernetes::KubectlCmd.delete("--ignore-not-found", "-f", METRICS_CONFIG)]
       end
 
       def verify_cluster?
diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb
index 08e52f32bb3..f31a6b8b50e 100644
--- a/app/models/clusters/applications/prometheus.rb
+++ b/app/models/clusters/applications/prometheus.rb
@@ -106,13 +106,13 @@ module Clusters
       def install_knative_metrics
         return [] unless cluster.application_knative_available?
 
-        ["kubectl apply -f #{Clusters::Applications::Knative::METRICS_CONFIG}"]
+        [Gitlab::Kubernetes::KubectlCmd.apply_file(Clusters::Applications::Knative::METRICS_CONFIG)]
       end
 
       def delete_knative_istio_metrics
         return [] unless cluster.application_knative_available?
 
-        ["kubectl delete -f #{Clusters::Applications::Knative::METRICS_CONFIG}"]
+        [Gitlab::Kubernetes::KubectlCmd.delete("-f", Clusters::Applications::Knative::METRICS_CONFIG)]
       end
     end
   end