diff options
author | Hordur Freyr Yngvason <hfyngvason@gitlab.com> | 2019-06-18 08:59:27 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-06-18 08:59:27 +0000 |
commit | 894bd84338b3446e56e54859fc320ff46ec3be23 (patch) | |
tree | 592b659cca6723a7175e31c1557da0a8a2af5455 | |
parent | c4efc7b53aad3be5109c4256f3438f908e180c20 (diff) | |
download | gitlab-ce-894bd84338b3446e56e54859fc320ff46ec3be23.tar.gz |
Remove support for creating non-RBAC kubernetes clusters
4 files changed, 8 insertions, 14 deletions
diff --git a/app/views/clusters/clusters/gcp/_form.html.haml b/app/views/clusters/clusters/gcp/_form.html.haml index 70e2eaeaf3b..4d3e3359ea0 100644 --- a/app/views/clusters/clusters/gcp/_form.html.haml +++ b/app/views/clusters/clusters/gcp/_form.html.haml @@ -65,15 +65,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 } - .form-group - = provider_gcp_field.check_box :legacy_abac, { label: s_('ClusterIntegration|RBAC-enabled cluster'), - label_class: 'label-bold' }, false, true - .form-text.text-muted - = s_('ClusterIntegration|Enable this setting if using role-based access control (RBAC).') - = s_('ClusterIntegration|This option will allow you to install applications on RBAC clusters.') - = link_to _('More information'), help_page_path('user/project/clusters/index.md', - anchor: 'role-based-access-control-rbac-core-only'), target: '_blank' - .form-group = field.check_box :managed, { label: s_('ClusterIntegration|GitLab-managed cluster'), label_class: 'label-bold' } diff --git a/changelogs/unreleased/55902-disable-creation-of-non-rbac-kubernetes-clusters.yml b/changelogs/unreleased/55902-disable-creation-of-non-rbac-kubernetes-clusters.yml new file mode 100644 index 00000000000..2af2d229c6c --- /dev/null +++ b/changelogs/unreleased/55902-disable-creation-of-non-rbac-kubernetes-clusters.yml @@ -0,0 +1,5 @@ +--- +title: Remove support for creating non-RBAC kubernetes clusters +merge_request: 29614 +author: +type: removed diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index 181b20dc710..a4d4fb91f71 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -71,7 +71,6 @@ new Kubernetes cluster to your project: - **Number of nodes** - Enter the number of nodes you wish the cluster to have. - **Machine type** - The [machine type](https://cloud.google.com/compute/docs/machine-types) of the Virtual Machine instance that the cluster will be based on. - - **RBAC-enabled cluster** - Leave this checked if using default GKE creation options, see the [RBAC section](#rbac-cluster-resources) for more information. - **GitLab-managed cluster** - Leave this checked if you want GitLab to manage namespaces and service accounts for this cluster. See the [Managed clusters section](#gitlab-managed-clusters) for more information. 1. Finally, click the **Create Kubernetes cluster** button. @@ -86,6 +85,9 @@ account](#access-controls). Starting from [GitLab creation process will explicitly request that basic authentication and client certificate is enabled. +NOTE: **Note:** +Starting from [GitLab 12.1](https://gitlab.com/gitlab-org/gitlab-ce/issues/55902), all GKE clusters created by GitLab are RBAC enabled. Take a look at the [RBAC section](#rbac-cluster-resources) for more information. + ## Adding an existing Kubernetes cluster To add an existing Kubernetes cluster to your project: diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index 83e582c34f0..e4a3a1a8c92 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -79,10 +79,6 @@ describe 'Gcp Cluster', :js do expect(page).to have_content('Something wrong!') end - - it 'user sees RBAC is enabled by default' do - expect(page).to have_checked_field('RBAC-enabled cluster') - end end context 'when user filled form with invalid parameters' do |