Merge pull request #471 from UffizziCloud/feature/470_change-clusters…

…-namespace-format [470] Change the clusters namespace format
UffizziCloud · Aug 22, 2023 · a5d46d2 · a5d46d2
2 parents 1aa9967 + ce2650f
commit a5d46d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/app/lib/uffizzi_core/concerns/models/cluster.rb b/core/app/lib/uffizzi_core/concerns/models/cluster.rb
@@ -4,7 +4,7 @@ module UffizziCore::Concerns::Models::Cluster
   extend ActiveSupport::Concern
   include UffizziCore::ClusterRepo
 
-  NAMESPACE_PREFIX = 'cluster'
+  NAMESPACE_PREFIX = 'c'
 
   included do
     include AASM
@@ -55,7 +55,7 @@ def after_disable
     end
 
     def namespace
-      [NAMESPACE_PREFIX, id].join('-')
+      [NAMESPACE_PREFIX, id].join
     end
   end
 end
diff --git a/core/test/controllers/uffizzi_core/api/cli/v1/projects/clusters_controller_test.rb b/core/test/controllers/uffizzi_core/api/cli/v1/projects/clusters_controller_test.rb
@@ -61,7 +61,7 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersControllerTest < ActionContro
     expected_request = {
       name: cluster_creation_data[:name],
       manifest: nil,
-      base_ingress_host: /#{UffizziCore::Cluster::NAMESPACE_PREFIX}-\d/,
+      base_ingress_host: /#{UffizziCore::Cluster::NAMESPACE_PREFIX}\d/,
     }
     stubbed_create_cluster_request = stub_create_cluster_request_with_expected(cluster_creation_data, expected_request)
     stubbed_create_namespace_request = stub_create_namespace_request
@@ -124,7 +124,7 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersControllerTest < ActionContro
     expected_request = {
       name: cluster_creation_data[:name],
       manifest: manifest,
-      base_ingress_host: /#{UffizziCore::Cluster::NAMESPACE_PREFIX}-\d/,
+      base_ingress_host: /#{UffizziCore::Cluster::NAMESPACE_PREFIX}\d/,
     }
     stubbed_create_cluster_request = stub_create_cluster_request_with_expected(cluster_creation_data, expected_request)
     stubbed_get_cluster_request = stub_get_cluster_request(cluster_show_data)