Commit 47b1a8d0 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'ff/remove-env-reactive-cache-ff' into 'master'

Removes reactive_caching_limit_environment FF

See merge request gitlab-org/gitlab!47950
parents c02edde6 6411cedb
...@@ -424,11 +424,6 @@ class Environment < ApplicationRecord ...@@ -424,11 +424,6 @@ class Environment < ApplicationRecord
def generate_slug def generate_slug
self.slug = Gitlab::Slug::Environment.new(name).generate self.slug = Gitlab::Slug::Environment.new(name).generate
end end
# Overrides ReactiveCaching default to activate limit checking behind a FF
def reactive_cache_limit_enabled?
Feature.enabled?(:reactive_caching_limit_environment, project, default_enabled: true)
end
end end
Environment.prepend_if_ee('EE::Environment') Environment.prepend_if_ee('EE::Environment')
---
title: Remove Feature Flag that controls data limit on Deploy Boards, thus making
10MB limits mandatory
merge_request: 47950
author:
type: changed
---
name: reactive_caching_limit_environment
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34202
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/202633
milestone: '13.2'
type: development
group: group::configure
default_enabled: true
...@@ -877,16 +877,6 @@ RSpec.describe Environment, :use_clean_rails_memory_store_caching do ...@@ -877,16 +877,6 @@ RSpec.describe Environment, :use_clean_rails_memory_store_caching do
expect(described_class.reactive_cache_hard_limit).to eq(10.megabyte) expect(described_class.reactive_cache_hard_limit).to eq(10.megabyte)
end end
it 'overrides reactive_cache_limit_enabled? with a FF' do
environment_with_enabled_ff = build(:environment, project: create(:project))
environment_with_disabled_ff = build(:environment, project: create(:project))
stub_feature_flags(reactive_caching_limit_environment: environment_with_enabled_ff.project)
expect(environment_with_enabled_ff.send(:reactive_cache_limit_enabled?)).to be_truthy
expect(environment_with_disabled_ff.send(:reactive_cache_limit_enabled?)).to be_falsey
end
it 'returns cache data from the deployment platform' do it 'returns cache data from the deployment platform' do
expect(environment.deployment_platform).to receive(:calculate_reactive_cache_for) expect(environment.deployment_platform).to receive(:calculate_reactive_cache_for)
.with(environment).and_return(pods: %w(pod1 pod2)) .with(environment).and_return(pods: %w(pod1 pod2))
......
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