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 /app | |
| 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
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_services/kubernetes_service.rb | 2 |
1 files changed, 1 insertions, 1 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 |