diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-07 10:39:14 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-07 10:39:14 +0000 |
commit | db2617fd5f690282a7e844a361eac9da6aeea8c7 (patch) | |
tree | 97407baf8c227a53b2cae49640f81200ff460ab6 | |
parent | 79c9eab1308d8ab79de18c4731c8c22e387ec385 (diff) | |
parent | 6fa106b8980fc818b206da6246f050e94ddbb073 (diff) | |
download | gitlab-ce-db2617fd5f690282a7e844a361eac9da6aeea8c7.tar.gz |
Merge branch 'default-kubernetes-namespace' into 'master'
Make a default namespace of Kubernetes service to contain project ID
Closes #28516
See merge request !9741
-rw-r--r-- | app/models/project_services/kubernetes_service.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/28516-default-kubernetes-namespace.yml | 4 | ||||
-rw-r--r-- | spec/models/project_services/kubernetes_service_spec.rb | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb index f2e1c906dac..02fbd5497fa 100644 --- a/app/models/project_services/kubernetes_service.rb +++ b/app/models/project_services/kubernetes_service.rb @@ -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 diff --git a/changelogs/unreleased/28516-default-kubernetes-namespace.yml b/changelogs/unreleased/28516-default-kubernetes-namespace.yml new file mode 100644 index 00000000000..9fa5c681a53 --- /dev/null +++ b/changelogs/unreleased/28516-default-kubernetes-namespace.yml @@ -0,0 +1,4 @@ +--- +title: Make a default namespace of Kubernetes service to contain project ID +merge_request: +author: diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb index 585c899cdf9..bf7950ef1c9 100644 --- a/spec/models/project_services/kubernetes_service_spec.rb +++ b/spec/models/project_services/kubernetes_service_spec.rb @@ -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 |