Commit ecb4ee16 authored by Etienne Baqué's avatar Etienne Baqué

Merge branch 'remove-ff-create_cloud_run_clusters' into 'master'

Remove feature flag create_cloud_run_clusters [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!62977
parents 9de15855 b878883f
...@@ -62,13 +62,12 @@ ...@@ -62,13 +62,12 @@
%p.form-text.text-muted %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 } = 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 Feature.enabled?(:create_cloud_run_clusters, clusterable, default_enabled: true) .form-group
.form-group = provider_gcp_field.check_box :cloud_run, { label: s_('ClusterIntegration|Enable Cloud Run for Anthos'),
= provider_gcp_field.check_box :cloud_run, { label: s_('ClusterIntegration|Enable Cloud Run for Anthos'), label_class: 'label-bold' }
label_class: 'label-bold' } .form-text.text-muted
.form-text.text-muted = s_('ClusterIntegration|Uses the Cloud Run, Istio, and HTTP Load Balancing addons for this cluster.')
= s_('ClusterIntegration|Uses the Cloud Run, Istio, and HTTP Load Balancing addons for this cluster.') = link_to _('More information'), help_page_path('user/project/clusters/add_gke_clusters.md', anchor: 'cloud-run-for-anthos'), target: '_blank'
= link_to _('More information'), help_page_path('user/project/clusters/add_gke_clusters.md', anchor: 'cloud-run-for-anthos'), target: '_blank'
.form-group .form-group
= field.check_box :managed, { label: s_('ClusterIntegration|GitLab-managed cluster'), = field.check_box :managed, { label: s_('ClusterIntegration|GitLab-managed cluster'),
......
---
name: create_cloud_run_clusters
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19063
rollout_issue_url:
milestone: '12.5'
type: development
group: group::configure
default_enabled: true
...@@ -23,16 +23,4 @@ RSpec.describe 'clusters/clusters/gcp/_form' do ...@@ -23,16 +23,4 @@ RSpec.describe 'clusters/clusters/gcp/_form' do
expect(rendered).to have_selector("input[id='cluster_provider_gcp_attributes_cloud_run']") expect(rendered).to have_selector("input[id='cluster_provider_gcp_attributes_cloud_run']")
end end
end end
context 'with cloud run feature flag disabled' do
before do
stub_feature_flags(create_cloud_run_clusters: false)
end
it 'does not have a cloud run checkbox' do
render
expect(rendered).not_to have_selector("input[id='cluster_provider_gcp_attributes_cloud_run']")
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment