diff options
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/clusters/kubernetes/create_or_update_service_account_service.rb | 8 | ||||
| -rw-r--r-- | app/services/issues/import_csv_service.rb | 2 | ||||
| -rw-r--r-- | app/services/packages/create_event_service.rb | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/app/services/clusters/kubernetes/create_or_update_service_account_service.rb b/app/services/clusters/kubernetes/create_or_update_service_account_service.rb index 2725a3aeaa5..5791b8ffcae 100644 --- a/app/services/clusters/kubernetes/create_or_update_service_account_service.rb +++ b/app/services/clusters/kubernetes/create_or_update_service_account_service.rb @@ -69,7 +69,13 @@ module Clusters def create_role_or_cluster_role_binding if namespace_creator - kubeclient.create_or_update_role_binding(role_binding_resource) + begin + kubeclient.delete_role_binding(role_binding_name, service_account_namespace) + rescue Kubeclient::ResourceNotFoundError + # Do nothing as we will create new role binding below + end + + kubeclient.update_role_binding(role_binding_resource) else kubeclient.create_or_update_cluster_role_binding(cluster_role_binding_resource) end diff --git a/app/services/issues/import_csv_service.rb b/app/services/issues/import_csv_service.rb index e71d098950e..16af0c88279 100644 --- a/app/services/issues/import_csv_service.rb +++ b/app/services/issues/import_csv_service.rb @@ -20,7 +20,7 @@ module Issues private def record_import_attempt - CsvIssueImport.create!(user: @user, project: @project) + Issues::CsvImport.create!(user: @user, project: @project) end def process_csv diff --git a/app/services/packages/create_event_service.rb b/app/services/packages/create_event_service.rb index d009cba2812..56480724031 100644 --- a/app/services/packages/create_event_service.rb +++ b/app/services/packages/create_event_service.rb @@ -3,6 +3,8 @@ module Packages class CreateEventService < BaseService def execute + return unless Feature.enabled?(:collect_package_events, default_enabled: false) + event_scope = scope.is_a?(::Packages::Package) ? scope.package_type : scope ::Packages::Event.create!( |