Skip to content
Snippets Groups Projects

Incorporates Kubernetes Namespace into Cluster's flow

Merged Thong Kuah requested to merge 51716-create-kube-namespace into master
1 unresolved thread
Compare and Show latest version
8 files
+ 16
19
Compare changes
  • Side-by-side
  • Inline
Files
8
@@ -69,7 +69,7 @@ def actual_namespace
@@ -69,7 +69,7 @@ def actual_namespace
end
end
end
end
def predefined_variables_for_project(project:)
def predefined_variables(project:)
Gitlab::Ci::Variables::Collection.new.tap do |variables|
Gitlab::Ci::Variables::Collection.new.tap do |variables|
variables.append(key: 'KUBE_URL', value: api_url)
variables.append(key: 'KUBE_URL', value: api_url)
@@ -79,9 +79,8 @@ def predefined_variables_for_project(project:)
@@ -79,9 +79,8 @@ def predefined_variables_for_project(project:)
.append(key: 'KUBE_CA_PEM_FILE', value: ca_pem, file: true)
.append(key: 'KUBE_CA_PEM_FILE', value: ca_pem, file: true)
end
end
if project.kubernetes_namespace.present?
if kubernetes_namespace = cluster.kubernetes_namespaces.find_by(project: project)
variables
variables.concat(kubernetes_namespace.predefined_variables)
.concat(project.kubernetes_namespace.predefined_variables)
else
else
# From 11.5, every Clusters::Project should have at least one
# From 11.5, every Clusters::Project should have at least one
# Clusters::KubernetesNamespace, so once migration has been completed,
# Clusters::KubernetesNamespace, so once migration has been completed,
Loading