uffizzi_core 2.0.14 → 2.0.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb +6 -0
- data/app/jobs/uffizzi_core/config_file/apply_job.rb +7 -0
- data/app/jobs/uffizzi_core/deployment/create_credential_job.rb +7 -0
- data/app/jobs/uffizzi_core/deployment/deploy_containers_job.rb +7 -0
- data/app/jobs/uffizzi_core/deployment/manage_deploy_activity_item_job.rb +11 -2
- data/app/jobs/uffizzi_core/deployment/update_credential_job.rb +7 -0
- data/app/lib/uffizzi_core/concerns/models/deployment.rb +1 -5
- data/app/services/uffizzi_core/activity_item_service.rb +13 -1
- data/app/services/uffizzi_core/deployment_service.rb +1 -1
- data/lib/uffizzi_core/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 725cca20ca80112e168ba374f53dc0fa5cb48ed92339996405610fad6d37e931
|
4
|
+
data.tar.gz: 44034045e9b25197d558202fb336ff7faab8b9f7ac02cea97bbbcbb5cfac711c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2c417dc4df5d3842a73941775b4f6267bfd41ed19f29db0a5b58496346ef77237a134d3eaf515f6f6cef975c29f0b962cbba82d1e293af36625ccb0e1a02fdda
|
7
|
+
data.tar.gz: 254aff6198f4136c367fcc1e64a58fdcc920bf009d3a3f842ceddf5d42b362eebf9f993c5d261649e60e3d3c6c0394f29e2a2bee0dfc4c2787eba4009dea1409
|
@@ -31,6 +31,12 @@ module UffizziCore::DependencyInjectionConcern
|
|
31
31
|
module_class(:ingress_parser)
|
32
32
|
end
|
33
33
|
|
34
|
+
def notification_module
|
35
|
+
return unless module_exists?(:notification_module)
|
36
|
+
|
37
|
+
module_class(:notification_module)
|
38
|
+
end
|
39
|
+
|
34
40
|
private
|
35
41
|
|
36
42
|
def module_exists?(module_name)
|
@@ -8,6 +8,13 @@ class UffizziCore::ConfigFile::ApplyJob < UffizziCore::ApplicationJob
|
|
8
8
|
when UffizziCore::DeploymentNotFoundError
|
9
9
|
Rails.logger.info("DEPLOYMENT_PROCESS ApplyJob retry deployment_id=#{exception.deployment_id} count=#{count}")
|
10
10
|
Settings.controller.resource_create_retry_time
|
11
|
+
else
|
12
|
+
if [Settings.default_job_retry_count, Settings.controller.resource_create_retry_count].include?(count)
|
13
|
+
Sentry.capture_exception(exception)
|
14
|
+
:kill
|
15
|
+
else
|
16
|
+
Settings.controller.resource_create_retry_time
|
17
|
+
end
|
11
18
|
end
|
12
19
|
end
|
13
20
|
|
@@ -8,6 +8,13 @@ class UffizziCore::Deployment::CreateCredentialJob < UffizziCore::ApplicationJob
|
|
8
8
|
when UffizziCore::DeploymentNotFoundError
|
9
9
|
Rails.logger.info("DEPLOYMENT_PROCESS CreateCredentialJob retry deployment_id=#{exception.deployment_id} count=#{count}")
|
10
10
|
Settings.controller.resource_create_retry_time
|
11
|
+
else
|
12
|
+
if [Settings.default_job_retry_count, Settings.controller.resource_create_retry_count].include?(count)
|
13
|
+
Sentry.capture_exception(exception)
|
14
|
+
:kill
|
15
|
+
else
|
16
|
+
Settings.controller.resource_create_retry_time
|
17
|
+
end
|
11
18
|
end
|
12
19
|
end
|
13
20
|
|
@@ -8,6 +8,13 @@ class UffizziCore::Deployment::DeployContainersJob < UffizziCore::ApplicationJob
|
|
8
8
|
when UffizziCore::DeploymentNotFoundError
|
9
9
|
Rails.logger.info("DEPLOYMENT_PROCESS DeployContainersJob retry deployment_id=#{exception.deployment_id} count=#{count}")
|
10
10
|
Settings.controller.resource_create_retry_time
|
11
|
+
else
|
12
|
+
if [Settings.default_job_retry_count, Settings.controller.resource_create_retry_count].include?(count)
|
13
|
+
Sentry.capture_exception(exception)
|
14
|
+
:kill
|
15
|
+
else
|
16
|
+
Settings.controller.resource_create_retry_time
|
17
|
+
end
|
11
18
|
end
|
12
19
|
end
|
13
20
|
|
@@ -1,13 +1,22 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
class UffizziCore::Deployment::ManageDeployActivityItemJob < UffizziCore::ApplicationJob
|
4
|
-
sidekiq_options queue: :deployments, retry:
|
4
|
+
sidekiq_options queue: :deployments, retry: Settings.default_job_retry_count
|
5
5
|
|
6
6
|
sidekiq_retry_in do |count, exception|
|
7
7
|
case exception
|
8
8
|
when UffizziCore::Deployment::ImagePullError
|
9
9
|
Rails.logger.info("DEPLOYMENT_PROCESS ManageDeployActivityItemJob retry deployment_id=#{exception.deployment_id} count=#{count}")
|
10
|
-
|
10
|
+
Settings.controller.resource_create_retry_time
|
11
|
+
when ActiveRecord::RecordNotFound
|
12
|
+
:kill if exception.model.constantize == UffizziCore::ActivityItem
|
13
|
+
else
|
14
|
+
if count == Settings.default_job_retry_count
|
15
|
+
Sentry.capture_exception(exception)
|
16
|
+
:kill
|
17
|
+
else
|
18
|
+
Settings.controller.resource_create_retry_time
|
19
|
+
end
|
11
20
|
end
|
12
21
|
end
|
13
22
|
|
@@ -8,6 +8,13 @@ class UffizziCore::Deployment::UpdateCredentialJob < UffizziCore::ApplicationJob
|
|
8
8
|
when UffizziCore::DeploymentNotFoundError
|
9
9
|
Rails.logger.info("DEPLOYMENT_PROCESS UpdateCredentialJob retry deployment_id=#{exception.deployment_id} count=#{count}")
|
10
10
|
Settings.controller.resource_update_retry_time
|
11
|
+
else
|
12
|
+
if [Settings.default_job_retry_count, Settings.controller.resource_update_retry_count].include?(count)
|
13
|
+
Sentry.capture_exception(exception)
|
14
|
+
:kill
|
15
|
+
else
|
16
|
+
Settings.controller.resource_create_retry_time
|
17
|
+
end
|
11
18
|
end
|
12
19
|
end
|
13
20
|
|
@@ -47,7 +47,7 @@ module UffizziCore::Concerns::Models::Deployment
|
|
47
47
|
transitions from: [:disabled], to: :active
|
48
48
|
end
|
49
49
|
|
50
|
-
event :fail
|
50
|
+
event :fail do
|
51
51
|
transitions from: [:active], to: :failed
|
52
52
|
end
|
53
53
|
|
@@ -61,10 +61,6 @@ module UffizziCore::Concerns::Models::Deployment
|
|
61
61
|
update!(disabled_at: Time.now)
|
62
62
|
end
|
63
63
|
|
64
|
-
def after_fail
|
65
|
-
active_containers.each(&:disable!)
|
66
|
-
end
|
67
|
-
|
68
64
|
def clean
|
69
65
|
active_containers.each(&:disable!)
|
70
66
|
UffizziCore::Deployment::DeleteJob.perform_async(id)
|
@@ -4,6 +4,8 @@ class UffizziCore::ActivityItemService
|
|
4
4
|
COMPLETED_STATES = ['deployed', 'failed', 'cancelled'].freeze
|
5
5
|
|
6
6
|
class << self
|
7
|
+
include UffizziCore::DependencyInjectionConcern
|
8
|
+
|
7
9
|
def create_docker_item!(repo, container)
|
8
10
|
activity_item_attributes = {
|
9
11
|
namespace: repo.namespace,
|
@@ -27,8 +29,9 @@ class UffizziCore::ActivityItemService
|
|
27
29
|
|
28
30
|
def fail_deployment!(activity_item)
|
29
31
|
deployment = activity_item.container.deployment
|
32
|
+
last_event = activity_item.events.order_by_id.last
|
30
33
|
|
31
|
-
activity_item.events.create(state: UffizziCore::Event.state.failed)
|
34
|
+
activity_item.events.create(state: UffizziCore::Event.state.failed) unless last_event&.failed?
|
32
35
|
|
33
36
|
UffizziCore::DeploymentService.fail!(deployment)
|
34
37
|
end
|
@@ -55,6 +58,11 @@ class UffizziCore::ActivityItemService
|
|
55
58
|
|
56
59
|
activity_item.events.create(state: status) if last_event&.state != status
|
57
60
|
|
61
|
+
if failed?(status)
|
62
|
+
UffizziCore::ActivityItemService.fail_deployment!(activity_item)
|
63
|
+
notification_module.notify_about_failed_deployment(deployment) if notification_module.present?
|
64
|
+
end
|
65
|
+
|
58
66
|
return unless [UffizziCore::Event.state.building, UffizziCore::Event.state.deploying].include?(status)
|
59
67
|
|
60
68
|
UffizziCore::Deployment::ManageDeployActivityItemJob.perform_in(5.seconds, activity_item.id)
|
@@ -75,5 +83,9 @@ class UffizziCore::ActivityItemService
|
|
75
83
|
last_event = activity_item.events.last
|
76
84
|
COMPLETED_STATES.include?(last_event.state)
|
77
85
|
end
|
86
|
+
|
87
|
+
def failed?(status)
|
88
|
+
status == UffizziCore::Event.state.failed
|
89
|
+
end
|
78
90
|
end
|
79
91
|
end
|
@@ -135,7 +135,7 @@ class UffizziCore::DeploymentService
|
|
135
135
|
end
|
136
136
|
|
137
137
|
def build_deployment_url(deployment)
|
138
|
-
"#{Settings.app.
|
138
|
+
"#{Settings.app.host}/projects/#{deployment.project_id}/deployments"
|
139
139
|
end
|
140
140
|
|
141
141
|
def all_containers_have_unique_ports?(containers)
|
data/lib/uffizzi_core/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: uffizzi_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.16
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Josh Thurman
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2022-12-
|
12
|
+
date: 2022-12-14 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: aasm
|