kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make a default namespace of Kubernetes service to contain project ID

This commit is contained in:
Kamil Trzcinski 2017-03-06 20:32:37 +01:00
parent 348dff0a82
commit 6fa106b898
No known key found for this signature in database
GPG Key ID: 4505F5C7E12C6A5A
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/project_services/kubernetes_service.rb
View File

@ -36,7 +36,7 @@ class KubernetesService < DeploymentService
def initialize_properties
if properties.nil?
self.properties = {}
self.namespace = project.path if project.present?
self.namespace = "#{project.path}-#{project.id}" if project.present?
end
end

4
changelogs/unreleased/28516-default-kubernetes-namespace.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Make a default namespace of Kubernetes service to contain project ID
merge_request:
author:

6
spec/models/project_services/kubernetes_service_spec.rb
View File

@ -74,8 +74,10 @@ describe KubernetesService, models: true, caching: true do
describe '#initialize_properties' do
context 'with a project' do
it 'defaults to the project name' do
expect(described_class.new(project: project).namespace).to eq(project.name)
let(:namespace_name) { "#{project.path}-#{project.id}" }
it 'defaults to the project name with ID' do
expect(described_class.new(project: project).namespace).to eq(namespace_name)
end
end