Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb
index c7c348ce9eb..9f66f35b5ab 100644
--- a/lib/gitlab/kubernetes/helm.rb
+++ b/lib/gitlab/kubernetes/helm.rb
@@ -10,6 +10,12 @@ module Gitlab
       SERVICE_ACCOUNT = 'tiller'
       CLUSTER_ROLE_BINDING = 'tiller-admin'
       CLUSTER_ROLE = 'cluster-admin'
+
+      MANAGED_APPS_LOCAL_TILLER_FEATURE_FLAG = :managed_apps_local_tiller
+
+      def self.local_tiller_enabled?
+        Feature.enabled?(MANAGED_APPS_LOCAL_TILLER_FEATURE_FLAG)
+      end
     end
   end
 end
diff --git a/lib/gitlab/kubernetes/helm/client_command.rb b/lib/gitlab/kubernetes/helm/client_command.rb
index b953ce24c4a..e7ade7e4d39 100644
--- a/lib/gitlab/kubernetes/helm/client_command.rb
+++ b/lib/gitlab/kubernetes/helm/client_command.rb
@@ -59,7 +59,7 @@ module Gitlab
         end
 
         def local_tiller_enabled?
-          Feature.enabled?(:managed_apps_local_tiller)
+          ::Gitlab::Kubernetes::Helm.local_tiller_enabled?
         end
       end
     end