diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2017-10-26 16:38:10 +0200 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2017-10-26 18:18:11 +0200 |
| commit | 3aafcc16fbdde08bf333eab97c5b1b3c4249a5cf (patch) | |
| tree | 31ba13811ff498a1508d33754d6035e12e2d09be /app/models/project_services/kubernetes_service.rb | |
| parent | 6798bab12a0faabf43f61eb65561b9f058824e4d (diff) | |
| download | gitlab-ce-3aafcc16fbdde08bf333eab97c5b1b3c4249a5cf.tar.gz | |
Add KubernetesService#default_namespace testsac-k8s-namespace-validator
Diffstat (limited to 'app/models/project_services/kubernetes_service.rb')
| -rw-r--r-- | app/models/project_services/kubernetes_service.rb | 11 |
1 files changed, 2 insertions, 9 deletions
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') |