diff options
author | João Cunha <j.a.cunha@gmail.com> | 2019-08-14 20:02:37 +0000 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-08-14 20:02:37 +0000 |
commit | f8821f828e13f16586630460f177d9de2c3e46e7 (patch) | |
tree | 719b110a81e1a1451318b8cfbd979642a0657aa5 /lib/gitlab/kubernetes | |
parent | 17cf43a301e88aac3c31424d5d1480588797de83 (diff) | |
download | gitlab-ce-f8821f828e13f16586630460f177d9de2c3e46e7.tar.gz |
Make use of Gitlab::Kubernetes
- refactor Knative and Prometheus
Diffstat (limited to 'lib/gitlab/kubernetes')
-rw-r--r-- | lib/gitlab/kubernetes/helm/reset_command.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/kubernetes/kubectl_cmd.rb | 19 |
2 files changed, 21 insertions, 2 deletions
diff --git a/lib/gitlab/kubernetes/helm/reset_command.rb b/lib/gitlab/kubernetes/helm/reset_command.rb index 37e1d8573ab..a35ffa34c58 100644 --- a/lib/gitlab/kubernetes/helm/reset_command.rb +++ b/lib/gitlab/kubernetes/helm/reset_command.rb @@ -38,9 +38,9 @@ module Gitlab # Tracking this method to be removed here: # https://gitlab.com/gitlab-org/gitlab-ce/issues/52791#note_199374155 def delete_tiller_replicaset - command = %w[kubectl delete replicaset -n gitlab-managed-apps -l name=tiller] + delete_args = %w[replicaset -n gitlab-managed-apps -l name=tiller] - command.shelljoin + Gitlab::Kubernetes::KubectlCmd.delete(*delete_args) end def reset_helm_command diff --git a/lib/gitlab/kubernetes/kubectl_cmd.rb b/lib/gitlab/kubernetes/kubectl_cmd.rb new file mode 100644 index 00000000000..981eb5681dc --- /dev/null +++ b/lib/gitlab/kubernetes/kubectl_cmd.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +module Gitlab + module Kubernetes + module KubectlCmd + class << self + def delete(*args) + %w(kubectl delete).concat(args).shelljoin + end + + def apply_file(filename, *args) + raise ArgumentError, "filename is not present" unless filename.present? + + %w(kubectl apply -f).concat([filename], args).shelljoin + end + end + end + end +end |