Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
8b83f904
Commit
8b83f904
authored
Aug 23, 2019
by
Tiger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove :kubernetes_namespace_per_environment feature flag
Feature flag has been defaulting to `true` since 12.2
parent
84064567
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
51 deletions
+19
-51
app/services/clusters/create_service.rb
app/services/clusters/create_service.rb
+1
-1
spec/support/services/clusters/create_service_shared.rb
spec/support/services/clusters/create_service_shared.rb
+18
-50
No files found.
app/services/clusters/create_service.rb
View file @
8b83f904
...
...
@@ -37,7 +37,7 @@ module Clusters
end
def
global_params
{
user:
current_user
,
namespace_per_environment:
Feature
.
enabled?
(
:kubernetes_namespace_per_environment
,
default_enabled:
true
)
}
{
user:
current_user
}
end
def
clusterable_params
...
...
spec/support/services/clusters/create_service_shared.rb
View file @
8b83f904
...
...
@@ -32,56 +32,24 @@ shared_context 'invalid cluster create params' do
end
shared_examples
'create cluster service success'
do
context
'namespace per environment feature is enabled'
do
before
do
stub_feature_flags
(
kubernetes_namespace_per_environment:
true
)
end
it
'creates a cluster object and performs a worker'
do
expect
(
ClusterProvisionWorker
).
to
receive
(
:perform_async
)
expect
{
subject
}
.
to
change
{
Clusters
::
Cluster
.
count
}.
by
(
1
)
.
and
change
{
Clusters
::
Providers
::
Gcp
.
count
}.
by
(
1
)
expect
(
subject
.
name
).
to
eq
(
'test-cluster'
)
expect
(
subject
.
user
).
to
eq
(
user
)
expect
(
subject
.
project
).
to
eq
(
project
)
expect
(
subject
.
provider
.
gcp_project_id
).
to
eq
(
'gcp-project'
)
expect
(
subject
.
provider
.
zone
).
to
eq
(
'us-central1-a'
)
expect
(
subject
.
provider
.
num_nodes
).
to
eq
(
1
)
expect
(
subject
.
provider
.
machine_type
).
to
eq
(
'machine_type-a'
)
expect
(
subject
.
provider
.
access_token
).
to
eq
(
access_token
)
expect
(
subject
.
provider
).
to
be_legacy_abac
expect
(
subject
.
platform
).
to
be_nil
expect
(
subject
.
namespace_per_environment
).
to
eq
true
end
end
context
'namespace per environment feature is disabled'
do
before
do
stub_feature_flags
(
kubernetes_namespace_per_environment:
false
)
end
it
'creates a cluster object and performs a worker'
do
expect
(
ClusterProvisionWorker
).
to
receive
(
:perform_async
)
expect
{
subject
}
.
to
change
{
Clusters
::
Cluster
.
count
}.
by
(
1
)
.
and
change
{
Clusters
::
Providers
::
Gcp
.
count
}.
by
(
1
)
expect
(
subject
.
name
).
to
eq
(
'test-cluster'
)
expect
(
subject
.
user
).
to
eq
(
user
)
expect
(
subject
.
project
).
to
eq
(
project
)
expect
(
subject
.
provider
.
gcp_project_id
).
to
eq
(
'gcp-project'
)
expect
(
subject
.
provider
.
zone
).
to
eq
(
'us-central1-a'
)
expect
(
subject
.
provider
.
num_nodes
).
to
eq
(
1
)
expect
(
subject
.
provider
.
machine_type
).
to
eq
(
'machine_type-a'
)
expect
(
subject
.
provider
.
access_token
).
to
eq
(
access_token
)
expect
(
subject
.
provider
).
to
be_legacy_abac
expect
(
subject
.
platform
).
to
be_nil
expect
(
subject
.
namespace_per_environment
).
to
eq
false
end
it
'creates a cluster object and performs a worker'
do
expect
(
ClusterProvisionWorker
).
to
receive
(
:perform_async
)
expect
{
subject
}
.
to
change
{
Clusters
::
Cluster
.
count
}.
by
(
1
)
.
and
change
{
Clusters
::
Providers
::
Gcp
.
count
}.
by
(
1
)
expect
(
subject
.
name
).
to
eq
(
'test-cluster'
)
expect
(
subject
.
user
).
to
eq
(
user
)
expect
(
subject
.
project
).
to
eq
(
project
)
expect
(
subject
.
provider
.
gcp_project_id
).
to
eq
(
'gcp-project'
)
expect
(
subject
.
provider
.
zone
).
to
eq
(
'us-central1-a'
)
expect
(
subject
.
provider
.
num_nodes
).
to
eq
(
1
)
expect
(
subject
.
provider
.
machine_type
).
to
eq
(
'machine_type-a'
)
expect
(
subject
.
provider
.
access_token
).
to
eq
(
access_token
)
expect
(
subject
.
provider
).
to
be_legacy_abac
expect
(
subject
.
platform
).
to
be_nil
expect
(
subject
.
namespace_per_environment
).
to
eq
true
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment