diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-08 03:32:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-08 03:32:37 +0300 |
| commit | 469a50879c1085ec77c95d650b7f135fee2c9e13 (patch) | |
| tree | 0d639a63294b5abdb4e4a7bf1ed5a497d5e6869f /app/models | |
| parent | aa5ca44f172f02f04cca448b1f9c17d6d933de40 (diff) | |
Add latest changes from gitlab-org/gitlab@13-7-stable-ee
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/clusters/applications/helm.rb | 2 | ||||
| -rw-r--r-- | app/models/environment.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb index 6f4b273a2c8..e89cb8be1e7 100644 --- a/app/models/clusters/applications/helm.rb +++ b/app/models/clusters/applications/helm.rb @@ -18,7 +18,7 @@ module Clusters include ::Clusters::Concerns::ApplicationStatus include ::Gitlab::Utils::StrongMemoize - default_value_for :version, Gitlab::Kubernetes::Helm::HELM_VERSION + default_value_for :version, Gitlab::Kubernetes::Helm::V2::BaseCommand::HELM_VERSION before_create :create_keys_and_certs diff --git a/app/models/environment.rb b/app/models/environment.rb index 31a95bb1b5d..4f7f688a040 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -405,6 +405,11 @@ class Environment < ApplicationRecord deployment_platform.patch_ingress(deployment_namespace, ingress, data) end + def clear_all_caches + expire_etag_cache + clear_reactive_cache! + end + private def rollout_status_available? |