Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
097ecc1c
Commit
097ecc1c
authored
Feb 17, 2020
by
Thong Kuah
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DRY feature flag to central location
parent
df90667f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
app/models/clusters/concerns/application_core.rb
app/models/clusters/concerns/application_core.rb
+1
-1
lib/gitlab/kubernetes/helm.rb
lib/gitlab/kubernetes/helm.rb
+6
-0
lib/gitlab/kubernetes/helm/client_command.rb
lib/gitlab/kubernetes/helm/client_command.rb
+1
-1
No files found.
app/models/clusters/concerns/application_core.rb
View file @
097ecc1c
...
...
@@ -15,7 +15,7 @@ module Clusters
def
set_initial_status
return
unless
not_installable?
self
.
status
=
status_states
[
:installable
]
if
cluster
&
.
application_helm_available?
||
Feature
.
enabled?
(
:managed_apps_local_tiller
)
self
.
status
=
status_states
[
:installable
]
if
cluster
&
.
application_helm_available?
||
::
Gitlab
::
Kubernetes
::
Helm
.
local_tiller_enabled?
end
def
can_uninstall?
...
...
lib/gitlab/kubernetes/helm.rb
View file @
097ecc1c
...
...
@@ -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
lib/gitlab/kubernetes/helm/client_command.rb
View file @
097ecc1c
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment