diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2018-11-27 07:30:09 +0300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2018-12-04 05:44:33 +0300 |
| commit | a97d8767514c6fc1e314a2b83260a8dad5a7e1f2 (patch) | |
| tree | bb7a82fc2b4df4ff69ab08f3b620cc6a63849f7e /spec/factories | |
| parent | 76d4e6d6d87f3e59f1864fa15da701bb789e301e (diff) | |
Fallback to admin token for project clusters only
We do not want group level clusters to fall back to what was old
behaviour for project level clusters. So instead we will not return any
KUBE_TOKEN if we cannot find a suitable kubernetes_namespace for the
project, in the group level cluster case.
Add test cases to assert above
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/clusters/kubernetes_namespaces.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/factories/clusters/kubernetes_namespaces.rb b/spec/factories/clusters/kubernetes_namespaces.rb index 6ad93fb0f45..3b50a57433f 100644 --- a/spec/factories/clusters/kubernetes_namespaces.rb +++ b/spec/factories/clusters/kubernetes_namespaces.rb @@ -5,10 +5,12 @@ FactoryBot.define do association :cluster, :project, :provided_by_gcp after(:build) do |kubernetes_namespace| - cluster_project = kubernetes_namespace.cluster.cluster_project + if kubernetes_namespace.cluster.project_type? + cluster_project = kubernetes_namespace.cluster.cluster_project - kubernetes_namespace.project = cluster_project.project - kubernetes_namespace.cluster_project = cluster_project + kubernetes_namespace.project = cluster_project.project + kubernetes_namespace.cluster_project = cluster_project + end end trait :with_token do |