From 0dc092ede5dba6a48eea3f240b650a17ebd08fc0 Mon Sep 17 00:00:00 2001 From: Lidia Mokevnina Date: Tue, 21 May 2024 17:24:49 +0200 Subject: [PATCH 1/6] [#509] added account_id to create cluster serializer --- .../controller/create_cluster/cluster_serializer.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb b/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb index 33b94eca..76729ec5 100644 --- a/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb +++ b/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb @@ -4,7 +4,7 @@ class UffizziCore::Controller::CreateCluster::ClusterSerializer < UffizziCore::B include UffizziCore::DependencyInjectionConcern include_module_if_exists('UffizziCore::Controller::CreateCluster::ClusterSerializerModule') - attributes :name, :manifest, :base_ingress_host, :distro, :image + attributes :name, :manifest, :base_ingress_host, :distro, :image, :account_id def base_ingress_host managed_dns_zone = controller_settings_service.vcluster_settings_by_vcluster(object).managed_dns_zone @@ -20,6 +20,10 @@ def distro kubernetes_distribution.distro end + def account_id + object.project.account_id + end + private def kubernetes_distribution From a89002c2786e1ab46c671e494b5576e7ce9ba4b3 Mon Sep 17 00:00:00 2001 From: Lidia Mokevnina Date: Thu, 23 May 2024 22:03:02 +0200 Subject: [PATCH 2/6] [#509] convert account_id to string in the serializer --- .../controller/create_cluster/cluster_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb b/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb index 76729ec5..d7b962f0 100644 --- a/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb +++ b/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb @@ -21,7 +21,7 @@ def distro end def account_id - object.project.account_id + object.project.account_id.to_s end private From d44e6104cd89a426e055baa53285d55c6aa3f9a1 Mon Sep 17 00:00:00 2001 From: Lidia Mokevnina Date: Thu, 23 May 2024 22:38:06 +0200 Subject: [PATCH 3/6] [#509] pass account_id as an int --- .../controller/create_cluster/cluster_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb b/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb index d7b962f0..76729ec5 100644 --- a/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb +++ b/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb @@ -21,7 +21,7 @@ def distro end def account_id - object.project.account_id.to_s + object.project.account_id end private From c600b7d7bb3a900228abe1ee8fea08cd7f47a215 Mon Sep 17 00:00:00 2001 From: Lidia Mokevnina Date: Fri, 24 May 2024 10:52:43 +0200 Subject: [PATCH 4/6] [#511] set the external network to true --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 1aadc53b..05790066 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -81,3 +81,4 @@ volumes: networks: default: name: 'uffizzi_default_network' + external: true From cfc6b2037d6da669abeedf1f7b4ff9285fad2c96 Mon Sep 17 00:00:00 2001 From: Lidia Mokevnina Date: Fri, 24 May 2024 11:22:58 +0200 Subject: [PATCH 5/6] [#511] removed external network --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 05790066..1aadc53b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -81,4 +81,3 @@ volumes: networks: default: name: 'uffizzi_default_network' - external: true From cfb53e217e2207e3cf85da08340adcc35e461843 Mon Sep 17 00:00:00 2001 From: Lidia Mokevnina Date: Fri, 24 May 2024 11:44:47 +0200 Subject: [PATCH 6/6] Change version to 2.4.8 --- Gemfile.lock | 26 +++++++++++------------ core/Gemfile.lock | 36 ++++++++++++++++---------------- core/lib/uffizzi_core/version.rb | 2 +- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4fbba055..f6a00de9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: core specs: - uffizzi_core (2.4.7) + uffizzi_core (2.4.8) aasm actionpack (~> 6.1.0) active_model_serializers @@ -111,20 +111,20 @@ GEM ast (2.4.2) awesome_print (1.9.2) aws-eventstream (1.3.0) - aws-partitions (1.897.0) - aws-sdk-core (3.191.3) + aws-partitions (1.934.0) + aws-sdk-core (3.196.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-ecr (1.69.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-ecr (1.72.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-eventbridge (1.57.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-eventbridge (1.59.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.94.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-iam (1.98.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) @@ -190,7 +190,7 @@ GEM dry-core (~> 0.5, >= 0.5) dry-initializer (~> 3.0) dry-schema (~> 1.9, >= 1.9.1) - enumerize (2.7.0) + enumerize (2.8.1) activesupport (>= 3.2) erubi (1.10.0) faraday (1.10.3) @@ -257,7 +257,7 @@ GEM mini_portile2 (2.8.0) minitest (5.15.0) msgpack (1.4.5) - multipart-post (2.4.0) + multipart-post (2.4.1) nio4r (2.5.8) nokogiri (1.13.3) mini_portile2 (~> 2.8.0) @@ -271,10 +271,10 @@ GEM ast (~> 2.4.1) parslet (2.0.0) pg (1.3.4) - public_suffix (5.0.4) + public_suffix (5.0.5) puma (4.3.11) nio4r (~> 2.0) - pundit (2.3.1) + pundit (2.3.2) activesupport (>= 3.0.0) racc (1.6.0) rack (2.2.3) diff --git a/core/Gemfile.lock b/core/Gemfile.lock index 126ed399..e590e505 100644 --- a/core/Gemfile.lock +++ b/core/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - uffizzi_core (2.4.7) + uffizzi_core (2.4.8) aasm actionpack (~> 6.1.0) active_model_serializers @@ -110,20 +110,20 @@ GEM activerecord (>= 5.2.6) awesome_print (1.9.2) aws-eventstream (1.3.0) - aws-partitions (1.895.0) - aws-sdk-core (3.191.3) + aws-partitions (1.934.0) + aws-sdk-core (3.196.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-ecr (1.69.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-ecr (1.72.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-eventbridge (1.57.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-eventbridge (1.59.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.94.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-iam (1.98.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) @@ -160,7 +160,7 @@ GEM digest (3.1.1) docker_distribution (0.1.2) digest (~> 3) - dotenv (3.1.0) + dotenv (3.1.2) dry-configurable (0.14.0) concurrent-ruby (~> 1.0) dry-core (~> 0.6) @@ -193,7 +193,7 @@ GEM dry-core (~> 0.5, >= 0.5) dry-initializer (~> 3.0) dry-schema (~> 1.9, >= 1.9.1) - enumerize (2.7.0) + enumerize (2.8.1) activesupport (>= 3.2) erubi (1.12.0) factory_bot (6.2.0) @@ -272,20 +272,20 @@ GEM minitest power_assert (>= 1.1) mocha (1.13.0) - multipart-post (2.4.0) - net-imap (0.4.10) + multipart-post (2.4.1) + net-imap (0.4.11) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol nio4r (2.5.8) - nokogiri (1.16.2-aarch64-linux) + nokogiri (1.16.5-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) octokit (8.1.0) base64 @@ -306,9 +306,9 @@ GEM public_suffix (4.0.6) puma (5.6.2) nio4r (~> 2.0) - pundit (2.3.1) + pundit (2.3.2) activesupport (>= 3.0.0) - racc (1.7.3) + racc (1.8.0) rack (2.2.3) rack-cors (1.1.1) rack (>= 2.0.0) diff --git a/core/lib/uffizzi_core/version.rb b/core/lib/uffizzi_core/version.rb index eb0d3629..7452db39 100644 --- a/core/lib/uffizzi_core/version.rb +++ b/core/lib/uffizzi_core/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module UffizziCore - VERSION = '2.4.7' + VERSION = '2.4.8' end