diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 09:06:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 09:06:21 +0000 |
| commit | 2b7a5214342baa2575b35868316ea9413d2afe1f (patch) | |
| tree | f80a862f7fa382620b8f8a695d07b6d1734fc5f5 /app/views/clusters | |
| parent | 15a2d004be2f79160752d77f701c0f08e7f96973 (diff) | |
| download | gitlab-ce-2b7a5214342baa2575b35868316ea9413d2afe1f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/clusters')
| -rw-r--r-- | app/views/clusters/clusters/_advanced_settings.html.haml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/app/views/clusters/clusters/_advanced_settings.html.haml b/app/views/clusters/clusters/_advanced_settings.html.haml index 8005dcbf65f..493d7a00854 100644 --- a/app/views/clusters/clusters/_advanced_settings.html.haml +++ b/app/views/clusters/clusters/_advanced_settings.html.haml @@ -1,3 +1,9 @@ +- group_id = @cluster.group.id if @cluster.group_type? + +- if @cluster.project_type? + - group_id = @cluster.project.group.id if @cluster.project.group + - user_id = @cluster.project.namespace.owner_id unless group_id + - if can?(current_user, :admin_cluster, @cluster) - unless @cluster.provided_by_user? .append-bottom-20 @@ -7,6 +13,21 @@ - link_gke = link_to(s_('ClusterIntegration|Google Kubernetes Engine'), @cluster.gke_cluster_url, target: '_blank', rel: 'noopener noreferrer') = s_('ClusterIntegration|Manage your Kubernetes cluster by visiting %{link_gke}').html_safe % { link_gke: link_gke } + = form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster, html: { class: 'cluster_management_form' } do |field| + + %h5 + = s_('ClusterIntegration|Cluster management project (alpha)') + + .form-group + .form-text.text-muted + = project_select_tag('cluster[management_project_id]', class: 'hidden-filter-value', toggle_class: 'js-project-search js-project-filter js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit', + placeholder: _('Select project'), idAttribute: 'id', data: { order_by: 'last_activity_at', idattribute: 'id', simple_filter: true, allow_clear: true, include_groups: false, include_projects_in_subgroups: true, group_id: group_id, user_id: user_id }, value: @cluster.management_project_id) + .text-muted + = s_('ClusterIntegration|A cluster management project can be used to run deployment jobs with Kubernetes <code>cluster-admin</code> privileges.').html_safe + = link_to _('More information'), help_page_path('user/clusters/management_project.md'), target: '_blank' + .form-group + = field.submit _('Save changes'), class: 'btn btn-success qa-save-domain' + .sub-section.form-group %h4.text-danger = s_('ClusterIntegration|Remove Kubernetes cluster integration') |