Merge branch '51009-remove-rbac-clusters-feature-flag' into 'master'
Remove :rbac_clusters feature flag Closes #51009 See merge request gitlab-org/gitlab-ce!22096
This commit is contained in:
commit
0e1fc6e04c
|
@ -13,8 +13,4 @@ module ClustersHelper
|
|||
render 'projects/clusters/gcp_signup_offer_banner'
|
||||
end
|
||||
end
|
||||
|
||||
def rbac_clusters_feature_enabled?
|
||||
Feature.enabled?(:rbac_clusters)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -61,7 +61,6 @@
|
|||
%p.form-text.text-muted
|
||||
= s_('ClusterIntegration|Learn more about %{help_link_start_machine_type}machine types%{help_link_end} and %{help_link_start_pricing}pricing%{help_link_end}.').html_safe % { help_link_start_machine_type: help_link_start % { url: machine_type_link_url }, help_link_start_pricing: help_link_start % { url: pricing_link_url }, help_link_end: help_link_end }
|
||||
|
||||
- if rbac_clusters_feature_enabled?
|
||||
.form-group
|
||||
.form-check
|
||||
= provider_gcp_field.check_box :legacy_abac, { class: 'form-check-input' }, false, true
|
||||
|
|
|
@ -37,7 +37,6 @@
|
|||
= platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)')
|
||||
= platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace')
|
||||
|
||||
- if rbac_clusters_feature_enabled?
|
||||
.form-group
|
||||
.form-check
|
||||
= platform_kubernetes_field.check_box :authorization_type, { class: 'form-check-input', disabled: true }, 'rbac', 'abac'
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
= platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)'), class: 'label-bold'
|
||||
= platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace')
|
||||
|
||||
- if rbac_clusters_feature_enabled?
|
||||
.form-group
|
||||
.form-check
|
||||
= platform_kubernetes_field.check_box :authorization_type, { class: 'form-check-input' }, 'rbac', 'abac'
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
= platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)'), class: 'label-bold'
|
||||
= platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace')
|
||||
|
||||
- if rbac_clusters_feature_enabled?
|
||||
.form-group
|
||||
.form-check
|
||||
= platform_kubernetes_field.check_box :authorization_type, { class: 'form-check-input', disabled: true }, 'rbac', 'abac'
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Remove 'rbac_clusters' feature flag
|
||||
merge_request: 22096
|
||||
author:
|
||||
type: changed
|
|
@ -134,36 +134,11 @@ authorization is [experimental](#role-based-access-control-rbac).
|
|||
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21401) in GitLab 11.4.
|
||||
|
||||
CAUTION: **Warning:**
|
||||
The RBAC authorization is experimental. To enable it you need access to the
|
||||
server where GitLab is installed.
|
||||
The RBAC authorization is experimental.
|
||||
|
||||
The support for RBAC-enabled clusters is hidden behind a feature flag. Once
|
||||
the feature flag is enabled, GitLab will create the necessary service accounts
|
||||
Once RBAC is enabled for a cluster, GitLab will create the necessary service accounts
|
||||
and privileges in order to install and run [GitLab managed applications](#installing-applications).
|
||||
|
||||
To enable the feature flag:
|
||||
|
||||
1. SSH into the server where GitLab is installed.
|
||||
1. Enter the Rails console:
|
||||
|
||||
**For Omnibus GitLab**
|
||||
|
||||
```sh
|
||||
sudo gitlab-rails console
|
||||
```
|
||||
|
||||
**For installations from source**
|
||||
|
||||
```sh
|
||||
sudo -u git -H bundle exec rails console
|
||||
```
|
||||
|
||||
1. Enable the RBAC authorization:
|
||||
|
||||
```ruby
|
||||
Feature.enable('rbac_clusters')
|
||||
```
|
||||
|
||||
If you are creating a [new GKE cluster via
|
||||
GitLab](#adding-and-creating-a-new-gke-cluster-via-gitlab), you will be
|
||||
asked if you would like to create an RBAC-enabled cluster. Enabling this
|
||||
|
|
|
@ -84,10 +84,8 @@ describe 'Gcp Cluster', :js do
|
|||
|
||||
it_behaves_like 'valid cluster gcp form'
|
||||
|
||||
context 'rbac_clusters feature flag is enabled' do
|
||||
context 'RBAC is enabled for the cluster' do
|
||||
before do
|
||||
stub_feature_flags(rbac_clusters: true)
|
||||
|
||||
check 'cluster_provider_gcp_attributes_legacy_abac'
|
||||
end
|
||||
|
||||
|
|
|
@ -44,10 +44,8 @@ describe 'User Cluster', :js do
|
|||
|
||||
it_behaves_like 'valid cluster user form'
|
||||
|
||||
context 'rbac_clusters feature flag is enabled' do
|
||||
context 'RBAC is enabled for the cluster' do
|
||||
before do
|
||||
stub_feature_flags(rbac_clusters: true)
|
||||
|
||||
check 'cluster_platform_kubernetes_attributes_authorization_type'
|
||||
end
|
||||
|
||||
|
|
|
@ -30,10 +30,6 @@ shared_context 'invalid cluster create params' do
|
|||
end
|
||||
|
||||
shared_examples 'create cluster service success' do
|
||||
before do
|
||||
stub_feature_flags(rbac_clusters: false)
|
||||
end
|
||||
|
||||
it 'creates a cluster object and performs a worker' do
|
||||
expect(ClusterProvisionWorker).to receive(:perform_async)
|
||||
|
||||
|
|
Loading…
Reference in New Issue