diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /app/views/clusters | |
parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'app/views/clusters')
17 files changed, 31 insertions, 192 deletions
diff --git a/app/views/clusters/clusters/_banner.html.haml b/app/views/clusters/clusters/_banner.html.haml index b7d1aa6f944..720e3ff08e2 100644 --- a/app/views/clusters/clusters/_banner.html.haml +++ b/app/views/clusters/clusters/_banner.html.haml @@ -7,13 +7,13 @@ %span.gl-ml-2= s_('ClusterIntegration|Kubernetes cluster is being created...') = render Pajamas::AlertComponent.new(variant: :warning, - alert_class: 'hidden js-cluster-api-unreachable') do - .gl-alert-body + alert_class: 'hidden js-cluster-api-unreachable') do |c| + = c.body do = s_('ClusterIntegration|Your cluster API is unreachable. Please ensure your API URL is correct.') = render Pajamas::AlertComponent.new(variant: :warning, - alert_class: 'hidden js-cluster-authentication-failure js-cluster-api-unreachable') do - .gl-alert-body + alert_class: 'hidden js-cluster-authentication-failure js-cluster-api-unreachable') do |c| + = c.body do = s_('ClusterIntegration|There was a problem authenticating with your cluster. Please ensure your CA Certificate and Token are valid.') .hidden.js-cluster-success.bs-callout.bs-callout-success{ role: 'alert' } diff --git a/app/views/clusters/clusters/_deprecation_alert.html.haml b/app/views/clusters/clusters/_deprecation_alert.html.haml index 202e2c14d3f..3a83efec29b 100644 --- a/app/views/clusters/clusters/_deprecation_alert.html.haml +++ b/app/views/clusters/clusters/_deprecation_alert.html.haml @@ -1,5 +1,5 @@ -= render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_class: 'gl-mt-6 gl-mb-3') do - .gl-alert-body += render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_class: 'gl-mt-6 gl-mb-3') do |c| + = c.body do - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe - issue_link_start = link_start % { url: 'https://gitlab.com/gitlab-org/configure/general/-/issues/199' } - docs_link_start = link_start % { url: help_page_path('user/clusters/agent/index.md') } diff --git a/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml b/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml index ffd910b1b9d..b130e0c7214 100644 --- a/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml +++ b/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml @@ -2,9 +2,9 @@ = render Pajamas::AlertComponent.new(title: s_('ClusterIntegration|Did you know?'), alert_class: 'gcp-signup-offer', - alert_data: { feature_id: Users::CalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: callouts_path }) do - .gl-alert-body + alert_data: { feature_id: Users::CalloutsHelper::GCP_SIGNUP_OFFER, dismiss_endpoint: callouts_path }) do |c| + = c.body do = s_('ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for both new and existing GCP accounts to get started with GitLab\'s Google Kubernetes Engine Integration.').html_safe % { sign_up_link: link } - .gl-alert-actions + = c.actions do %a.gl-button.btn-confirm.text-decoration-none{ href: 'https://cloud.google.com/partners/partnercredit/?pcn_code=0014M00001h35gDQAQ#contact-form', target: '_blank', rel: 'noopener noreferrer' } = s_("ClusterIntegration|Apply for credit") diff --git a/app/views/clusters/clusters/_integrations.html.haml b/app/views/clusters/clusters/_integrations.html.haml index c670dafb947..62ae551fee7 100644 --- a/app/views/clusters/clusters/_integrations.html.haml +++ b/app/views/clusters/clusters/_integrations.html.haml @@ -13,15 +13,16 @@ = prometheus_form.gitlab_ui_checkbox_component :enabled, s_('ClusterIntegration|Enable Prometheus integration'), help_text: '%{help_text} %{help_link}'.html_safe % { help_text: help_text, help_link: help_link } - = prometheus_form.submit _('Save changes'), class: 'btn gl-button btn-success' + = prometheus_form.submit _('Save changes'), class: 'btn gl-button btn-confirm' - .sub-section.form-group - = gitlab_ui_form_for @elastic_stack_integration, as: :integration, namespace: :elastic_stack, url: @cluster.integrations_path, method: :post, html: { class: 'js-cluster-integrations-form' } do |elastic_stack_form| - = elastic_stack_form.hidden_field :application_type - .form-group.gl-form-group - - help_text = s_('ClusterIntegration|Allows GitLab to query a specifically configured in-cluster Elasticsearch for pod logs.') - - help_link = link_to(_('More information.'), help_page_path("user/clusters/integrations", anchor: "elastic-stack-cluster-integration"), target: '_blank', rel: 'noopener noreferrer') - = elastic_stack_form.gitlab_ui_checkbox_component :enabled, - s_('ClusterIntegration|Enable Elastic Stack integration'), - help_text: '%{help_text} %{help_link}'.html_safe % { help_text: help_text, help_link: help_link } - = elastic_stack_form.submit _('Save changes'), class: 'btn gl-button btn-success' + - if Feature.enabled?(:monitor_logging, @project) + .sub-section.form-group + = gitlab_ui_form_for @elastic_stack_integration, as: :integration, namespace: :elastic_stack, url: @cluster.integrations_path, method: :post, html: { class: 'js-cluster-integrations-form' } do |elastic_stack_form| + = elastic_stack_form.hidden_field :application_type + .form-group.gl-form-group + - help_text = s_('ClusterIntegration|Allows GitLab to query a specifically configured in-cluster Elasticsearch for pod logs.') + - help_link = link_to(_('More information.'), help_page_path("user/clusters/integrations", anchor: "elastic-stack-cluster-integration"), target: '_blank', rel: 'noopener noreferrer') + = elastic_stack_form.gitlab_ui_checkbox_component :enabled, + s_('ClusterIntegration|Enable Elastic Stack integration'), + help_text: '%{help_text} %{help_link}'.html_safe % { help_text: help_text, help_link: help_link } + = elastic_stack_form.submit _('Save changes'), class: 'btn gl-button btn-confirm' diff --git a/app/views/clusters/clusters/_sidebar.html.haml b/app/views/clusters/clusters/_sidebar.html.haml index 045c03df4fa..e479773e70d 100644 --- a/app/views/clusters/clusters/_sidebar.html.haml +++ b/app/views/clusters/clusters/_sidebar.html.haml @@ -1,5 +1,4 @@ - is_connect_page = local_assigns.fetch(:is_connect_page, false) -- docs_mode = local_assigns.fetch(:docs_mode, false) - title = is_connect_page ? s_('ClusterIntegration|Connect a Kubernetes cluster') : s_('ClusterIntegration|Create a Kubernetes cluster') %h3 @@ -7,7 +6,7 @@ %p = clusterable.sidebar_text -- if !docs_mode +- if is_connect_page %p = clusterable.learn_more_link diff --git a/app/views/clusters/clusters/aws/_new.html.haml b/app/views/clusters/clusters/aws/_new.html.haml deleted file mode 100644 index 7142dd83dce..00000000000 --- a/app/views/clusters/clusters/aws/_new.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -- if !Gitlab::CurrentSettings.eks_integration_enabled? - - documentation_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/clusters/add_eks_clusters.md', - anchor: 'additional-requirements-for-self-managed-instances') } - = s_('Amazon authentication is not %{link_start}correctly configured%{link_end}. Ask your GitLab administrator if you want to use this service.').html_safe % { link_start: documentation_link_start, link_end: '<a/>'.html_safe } -- else - .js-create-eks-cluster-form-container{ data: { 'gitlab-managed-cluster-help-path' => help_page_path('user/project/clusters/gitlab_managed_clusters.md'), - 'namespace-per-environment-help-path' => help_page_path('user/project/clusters/deploy_to_cluster.md', anchor: 'custom-namespace'), - 'create-role-path' => clusterable.authorize_aws_role_path, - 'create-cluster-path' => clusterable.create_aws_clusters_path, - 'account-id' => Gitlab::CurrentSettings.eks_account_id, - 'external-id' => @aws_role.role_external_id, - 'role-arn' => @aws_role.role_arn, - 'instance-types' => @instance_types, - 'kubernetes-integration-help-path' => help_page_path('user/infrastructure/clusters/index.md'), - 'account-and-external-ids-help-path' => help_page_path('user/project/clusters/add_eks_clusters.md', anchor: 'how-to-create-a-new-cluster-on-eks-through-cluster-certificates-deprecated'), - 'create-role-arn-help-path' => help_page_path('user/project/clusters/add_eks_clusters.md', anchor: 'how-to-create-a-new-cluster-on-eks-through-cluster-certificates-deprecated'), - 'external-link-icon' => sprite_icon('external-link') } } diff --git a/app/views/clusters/clusters/cloud_providers/_cloud_provider_button.html.haml b/app/views/clusters/clusters/cloud_providers/_cloud_provider_button.html.haml index 807f98b7b0a..bed671832f3 100644 --- a/app/views/clusters/clusters/cloud_providers/_cloud_provider_button.html.haml +++ b/app/views/clusters/clusters/cloud_providers/_cloud_provider_button.html.haml @@ -1,15 +1,11 @@ -- provider = local_assigns.fetch(:provider) -- is_current_provider = provider == params[:provider] - logo_path = local_assigns.fetch(:logo_path) - help_path = local_assigns.fetch(:help_path) - label = local_assigns.fetch(:label) - last = local_assigns.fetch(:last, false) -- docs_mode = local_assigns.fetch(:docs_mode, false) - classes = ["btn btn-confirm gl-button btn-confirm-secondary gl-flex-direction-column gl-w-half"] -- conditional_classes = [("gl-mr-5" unless last), ("active" if is_current_provider && !docs_mode), ("js-create-#{provider}-cluster-button" if !docs_mode)] -- link = docs_mode ? help_path : clusterable.new_path(provider: provider) +- conditional_classes = [("gl-mr-5" unless last)] -= link_to link, class: classes + conditional_classes do += link_to help_path, class: classes + conditional_classes do .svg-content.gl-p-3= image_tag logo_path, alt: label, class: "gl-w-64 gl-h-64" %span = label diff --git a/app/views/clusters/clusters/cloud_providers/_cloud_provider_selector.html.haml b/app/views/clusters/clusters/cloud_providers/_cloud_provider_selector.html.haml index 69250141816..e4128ee22a4 100644 --- a/app/views/clusters/clusters/cloud_providers/_cloud_provider_selector.html.haml +++ b/app/views/clusters/clusters/cloud_providers/_cloud_provider_selector.html.haml @@ -3,13 +3,12 @@ - create_cluster_label = s_('ClusterIntegration|Where do you want to create a cluster?') - eks_help_path = help_page_path('user/infrastructure/clusters/connect/new_eks_cluster') - gke_help_path = help_page_path('user/infrastructure/clusters/connect/new_gke_cluster') -- docs_mode = local_assigns.fetch(:docs_mode, false) .gl-p-5 %h4.gl-mb-5 = create_cluster_label .gl-display-flex = render partial: 'clusters/clusters/cloud_providers/cloud_provider_button', - locals: { provider: 'aws', label: eks_label, logo_path: 'illustrations/logos/amazon_eks.svg', help_path: eks_help_path, docs_mode: docs_mode } + locals: { label: eks_label, logo_path: 'illustrations/logos/amazon_eks.svg', help_path: eks_help_path } = render partial: 'clusters/clusters/cloud_providers/cloud_provider_button', - locals: { provider: 'gcp', label: gke_label, logo_path: 'illustrations/logos/google_gke.svg', help_path: gke_help_path, docs_mode: docs_mode, last: true } + locals: { label: gke_label, logo_path: 'illustrations/logos/google_gke.svg', help_path: gke_help_path, last: true } diff --git a/app/views/clusters/clusters/connect.html.haml b/app/views/clusters/clusters/connect.html.haml index ec00a9c345a..82750974803 100644 --- a/app/views/clusters/clusters/connect.html.haml +++ b/app/views/clusters/clusters/connect.html.haml @@ -9,5 +9,5 @@ .gl-w-quarter.gl-xs-w-full.gl-flex-shrink-0.gl-md-mr-5 = render 'sidebar', is_connect_page: true .gl-w-full - #js-cluster-new{ data: js_cluster_new } + #js-cluster-new = render 'clusters/clusters/user/form' diff --git a/app/views/clusters/clusters/gcp/_form.html.haml b/app/views/clusters/clusters/gcp/_form.html.haml deleted file mode 100644 index 58b8e8b1003..00000000000 --- a/app/views/clusters/clusters/gcp/_form.html.haml +++ /dev/null @@ -1,87 +0,0 @@ -- external_link_icon = sprite_icon('external-link') -- zones_link_url = 'https://cloud.google.com/compute/docs/regions-zones/regions-zones' -- machine_type_link_url = 'https://cloud.google.com/compute/docs/machine-types' -- pricing_link_url = 'https://cloud.google.com/compute/pricing#machinetype' -- kubernetes_integration_url = help_page_path('user/infrastructure/clusters/index.md') -- help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe -- help_link_end = ' %{external_link_icon}</a>'.html_safe % { external_link_icon: external_link_icon } - -%p - = s_('ClusterIntegration|Read our %{link_start}help page%{link_end} on Kubernetes cluster integration.').html_safe % { link_start: help_link_start % { url: kubernetes_integration_url }, link_end: '</a>'.html_safe } - -%p= link_to('Select a different Google account', @authorize_url) - -= bootstrap_form_for @gcp_cluster, html: { class: 'gl-show-field-errors js-gke-cluster-creation prepend-top-20', - data: { token: token_in_session } }, url: clusterable.create_gcp_clusters_path, as: :cluster do |field| - = field.text_field :name, required: true, title: s_('ClusterIntegration|Cluster name is required.'), - label: s_('ClusterIntegration|Kubernetes cluster name'), label_class: 'label-bold' - = field.form_group :environment_scope, label: { text: s_('ClusterIntegration|Environment scope'), - class: 'label-bold' } do - = field.text_field :environment_scope, required: true, class: 'form-control', - title: 'Environment scope is required.', wrapper: false - .form-text.text-muted= s_("ClusterIntegration|Choose which of your environments will use this cluster.") - - = field.fields_for :provider_gcp, @gcp_cluster.provider_gcp do |provider_gcp_field| - .form-group - = provider_gcp_field.label :gcp_project_id, s_('ClusterIntegration|Google Cloud Platform project'), - class: 'label-bold' - .js-gcp-project-id-dropdown-entry-point{ data: { docsUrl: 'https://console.cloud.google.com/home/dashboard' } } - = provider_gcp_field.hidden_field :gcp_project_id - .dropdown - %button.dropdown-menu-toggle.dropdown-menu-full-width{ type: 'button', disabled: true } - %span.dropdown-toggle-text - = _('Select project') - = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3') - %span.form-text.text-muted - - .form-group - = provider_gcp_field.label :zone, s_('ClusterIntegration|Zone'), class: 'label-bold' - .js-gcp-zone-dropdown-entry-point - = provider_gcp_field.hidden_field :zone - .dropdown - %button.dropdown-menu-toggle.dropdown-menu-full-width{ type: 'button', disabled: true } - %span.dropdown-toggle-text - = _('Select project to choose zone') - = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3') - %p.form-text.text-muted - = s_('ClusterIntegration|Learn more about %{help_link_start}zones%{help_link_end}.').html_safe % { help_link_start: help_link_start % { url: zones_link_url }, help_link_end: help_link_end } - - = provider_gcp_field.number_field :num_nodes, required: true, placeholder: '3', - title: s_('ClusterIntegration|Number of nodes must be a numerical value.'), - label: s_('ClusterIntegration|Number of nodes'), label_class: 'label-bold' - - .form-group - = provider_gcp_field.label :machine_type, s_('ClusterIntegration|Machine type'), class: 'label-bold' - .js-gcp-machine-type-dropdown-entry-point - = provider_gcp_field.hidden_field :machine_type - .dropdown - %button.dropdown-menu-toggle.dropdown-menu-full-width{ type: 'button', disabled: true } - %span.dropdown-toggle-text - = _('Select project and zone to choose machine type') - = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3') - %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 :cloud_run, { label: s_('ClusterIntegration|Enable Cloud Run for Anthos'), - label_class: 'label-bold' } - .form-text.text-muted - = s_('ClusterIntegration|Uses the Cloud Run, Istio, and HTTP Load Balancing addons for this cluster.') - = link_to _('Learn more.'), help_page_path('user/project/clusters/add_gke_clusters.md', anchor: 'cloud-run-for-anthos'), target: '_blank', rel: 'noopener noreferrer' - - .form-group - = field.check_box :managed, { label: s_('ClusterIntegration|GitLab-managed cluster'), - label_class: 'label-bold' } - .form-text.text-muted - = s_('ClusterIntegration|Allow GitLab to manage namespaces and service accounts for this cluster.') - = link_to _('Learn more.'), help_page_path('user/project/clusters/gitlab_managed_clusters.md'), target: '_blank', rel: 'noopener noreferrer' - - .form-group - = field.check_box :namespace_per_environment, { label: s_('ClusterIntegration|Namespace per environment'), label_class: 'label-bold' } - .form-text.text-muted - = s_('ClusterIntegration|Deploy each environment to its own namespace. Otherwise, environments within a project share a project-wide namespace. Note that anyone who can trigger a deployment of a namespace can read its secrets. If modified, existing environments will use their current namespaces until the cluster cache is cleared.') - = link_to _('Learn more.'), help_page_path('user/project/clusters/deploy_to_cluster.md', anchor: 'custom-namespace'), target: '_blank', rel: 'noopener noreferrer' - - .form-group.js-gke-cluster-creation-submit-container - = field.submit s_('ClusterIntegration|Create Kubernetes cluster'), - class: 'js-gke-cluster-creation-submit gl-button btn btn-confirm', disabled: true diff --git a/app/views/clusters/clusters/gcp/_gcp_not_configured.html.haml b/app/views/clusters/clusters/gcp/_gcp_not_configured.html.haml deleted file mode 100644 index f1f26a0aab8..00000000000 --- a/app/views/clusters/clusters/gcp/_gcp_not_configured.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -- documentation_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path("integration/google") } -- link_end = '<a/>'.html_safe -= s_('Google authentication is not %{link_start}properly configured%{link_end}. Ask your GitLab administrator if you want to use this service.').html_safe % { link_start: documentation_link_start, link_end: link_end } diff --git a/app/views/clusters/clusters/gcp/_header.html.haml b/app/views/clusters/clusters/gcp/_header.html.haml deleted file mode 100644 index a2ad3cd64df..00000000000 --- a/app/views/clusters/clusters/gcp/_header.html.haml +++ /dev/null @@ -1,14 +0,0 @@ -%h4 - = s_('ClusterIntegration|Enter the details for your Kubernetes cluster') -%p - = s_('ClusterIntegration|Please make sure that your Google account meets the following requirements:') -%ul - %li - - link_to_kubernetes_engine = link_to(s_('ClusterIntegration|access to Google Kubernetes Engine'), 'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer') - = s_('ClusterIntegration|Your account must have %{link_to_kubernetes_engine}').html_safe % { link_to_kubernetes_engine: link_to_kubernetes_engine } - %li - - link_to_requirements = link_to(s_('ClusterIntegration|meets the requirements'), 'https://cloud.google.com/kubernetes-engine/docs/quickstart?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer') - = s_('ClusterIntegration|Make sure your account %{link_to_requirements} to create Kubernetes clusters').html_safe % { link_to_requirements: link_to_requirements } - %li - - link_to_container_project = link_to(s_('ClusterIntegration|Google Kubernetes Engine project'), 'https://console.cloud.google.com/home/dashboard?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral', target: '_blank', rel: 'noopener noreferrer') - = s_('ClusterIntegration|This account must have permissions to create a Kubernetes cluster in the %{link_to_container_project} specified below').html_safe % { link_to_container_project: link_to_container_project } diff --git a/app/views/clusters/clusters/gcp/_new.html.haml b/app/views/clusters/clusters/gcp/_new.html.haml deleted file mode 100644 index 6c3a230fb93..00000000000 --- a/app/views/clusters/clusters/gcp/_new.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -= render 'clusters/clusters/gcp/header' -- if @valid_gcp_token - = render 'clusters/clusters/gcp/form' -- else - = render 'clusters/clusters/gcp/gcp_not_configured' diff --git a/app/views/clusters/clusters/new.html.haml b/app/views/clusters/clusters/new.html.haml deleted file mode 100644 index 53d521fface..00000000000 --- a/app/views/clusters/clusters/new.html.haml +++ /dev/null @@ -1,19 +0,0 @@ -- @content_class = 'limit-container-width' unless fluid_layout -- add_to_breadcrumbs _('Kubernetes Clusters'), clusterable.index_path -- breadcrumb_title _('Create a cluster') -- page_title _('Create a Kubernetes cluster') -- provider = params[:provider] - -= render 'deprecation_alert' - -= render_gcp_signup_offer - -.gl-md-display-flex.gl-mt-3 - .gl-w-quarter.gl-xs-w-full.gl-flex-shrink-0.gl-md-mr-5 - = render 'sidebar', is_connect_page: false - .gl-w-full - = render 'clusters/clusters/cloud_providers/cloud_provider_selector' - - - if ['aws', 'gcp'].include?(provider) - .gl-p-5.gl-border-1.gl-border-t-solid.gl-border-gray-100 - = render "clusters/clusters/#{provider}/new" diff --git a/app/views/clusters/clusters/new_cluster_docs.html.haml b/app/views/clusters/clusters/new_cluster_docs.html.haml index 9b99aef0e72..bff371b8d51 100644 --- a/app/views/clusters/clusters/new_cluster_docs.html.haml +++ b/app/views/clusters/clusters/new_cluster_docs.html.haml @@ -2,12 +2,11 @@ - add_to_breadcrumbs _('Kubernetes Clusters'), clusterable.index_path - breadcrumb_title _('Create a cluster') - page_title _('Create a Kubernetes cluster') -- docs_mode = true = render_gcp_signup_offer .gl-md-display-flex.gl-mt-3 .gl-w-quarter.gl-xs-w-full.gl-flex-shrink-0.gl-md-mr-5 - = render 'sidebar', docs_mode: docs_mode, is_connect_page: false + = render 'sidebar', is_connect_page: false .gl-w-full - = render 'clusters/clusters/cloud_providers/cloud_provider_selector', docs_mode: docs_mode + = render 'clusters/clusters/cloud_providers/cloud_provider_selector' diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml index fb46b4e5064..58e0ef96333 100644 --- a/app/views/clusters/clusters/show.html.haml +++ b/app/views/clusters/clusters/show.html.haml @@ -28,14 +28,6 @@ = render 'banner' - .gl-alert.gl-alert-warning{ role: 'alert' } - = sprite_icon('warning', css_class: "gl-alert-icon gl-alert-icon-no-title gl-icon") - %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss'), data: { testid: 'dismiss-one-click-application-removal' } } - = sprite_icon('close', css_class: 'gl-icon') - .gl-alert-body - = s_('ClusterApplicationsRemoved|One-click application management was removed in GitLab 14.0. Your applications are still installed in your cluster, and integrations continue working.') - = link_to _('More information.'), help_page_path("user/clusters/applications"), target: '_blank', rel: 'noopener noreferrer' - - if cluster_created?(@cluster) .js-toggle-container = gl_tabs_nav do diff --git a/app/views/clusters/clusters/user/_form.html.haml b/app/views/clusters/clusters/user/_form.html.haml index 2dd15ebd266..bf7b24181c1 100644 --- a/app/views/clusters/clusters/user/_form.html.haml +++ b/app/views/clusters/clusters/user/_form.html.haml @@ -1,7 +1,5 @@ -- more_info_link = link_to _('Learn more.'), help_page_path('user/project/clusters/add_remove_clusters.md', - anchor: 'add-existing-cluster'), target: '_blank', rel: 'noopener noreferrer' -- rbac_help_link = link_to _('Learn more.'), help_page_path('user/project/clusters/add_remove_clusters.md', - anchor: 'access-controls'), target: '_blank', rel: 'noopener noreferrer' +- more_info_link = link_to _('Learn more.'), help_page_path('user/project/clusters/add_existing_cluster'), target: '_blank', rel: 'noopener noreferrer' +- rbac_help_link = link_to _('Learn more.'), help_page_path('user/project/clusters/cluster_access'), target: '_blank', rel: 'noopener noreferrer' - api_url_help_text = s_('ClusterIntegration|The URL used to access the Kubernetes API.') - ca_cert_help_text = s_('ClusterIntegration|The Kubernetes certificate used to authenticate to the cluster.') |