From 3aafcc16fbdde08bf333eab97c5b1b3c4249a5cf Mon Sep 17 00:00:00 2001 From: Alessio Caiazza Date: Thu, 26 Oct 2017 16:38:10 +0200 Subject: Add KubernetesService#default_namespace tests --- app/models/project_services/kubernetes_service.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'app') diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb index 45a544e3674..5c0b3338a62 100644 --- a/app/models/project_services/kubernetes_service.rb +++ b/app/models/project_services/kubernetes_service.rb @@ -155,15 +155,8 @@ class KubernetesService < DeploymentService def default_namespace return unless project - # 1. lowercase - # 2. replace non kubernetes characters with dash - # 3. trim dash from the beginning and end - - slugified = "#{project.path}-#{project.id}" - slugified.downcase! - slugified.gsub!(/[^a-z0-9]/, '-') - slugified.gsub!(/^-+|-+$/, '') - slugified + slug = "#{project.path}-#{project.id}".downcase + slug.gsub(/[^-a-z0-9]/, '-').gsub(/^-+/, '') end def build_kubeclient!(api_path: 'api', api_version: 'v1') -- cgit v1.2.1