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
5ce01342
Commit
5ce01342
authored
Oct 11, 2019
by
Thong Kuah
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Return management_project details on GET clusters
Also returns management_project details on POST and PUT
parent
d857ec57
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
63 additions
and
0 deletions
+63
-0
doc/api/group_clusters.md
doc/api/group_clusters.md
+31
-0
doc/api/project_clusters.md
doc/api/project_clusters.md
+31
-0
lib/api/entities.rb
lib/api/entities.rb
+1
-0
No files found.
doc/api/group_clusters.md
View file @
5ce01342
...
...
@@ -53,6 +53,16 @@ Example response:
"api_url"
:
"https://104.197.68.152"
,
"authorization_type"
:
"rbac"
,
"ca_cert"
:
"-----BEGIN CERTIFICATE-----
\r\n
hFiK1L61owwDQYJKoZIhvcNAQELBQAw
\r\n
LzEtMCsGA1UEAxMkZDA1YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM4ZDBj
\r\n
MB4XDTE4MTIyNzIwMDM1MVoXDTIzMTIyNjIxMDM1MVowLzEtMCsGA1UEAxMkZDA1
\r\n
YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM.......-----END CERTIFICATE-----"
},
"management_project"
:
{
"id"
:
2
,
"description"
:
null
,
"name"
:
"project2"
,
"name_with_namespace"
:
"John Doe8 / project2"
,
"path"
:
"project2"
,
"path_with_namespace"
:
"namespace2/project2"
,
"created_at"
:
"2019-10-11T02:55:54.138Z"
}
},
{
...
...
@@ -111,6 +121,16 @@ Example response:
"authorization_type"
:
"rbac"
,
"ca_cert"
:
"-----BEGIN CERTIFICATE-----
\r\n
hFiK1L61owwDQYJKoZIhvcNAQELBQAw
\r\n
LzEtMCsGA1UEAxMkZDA1YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM4ZDBj
\r\n
MB4XDTE4MTIyNzIwMDM1MVoXDTIzMTIyNjIxMDM1MVowLzEtMCsGA1UEAxMkZDA1
\r\n
YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM.......-----END CERTIFICATE-----"
},
"management_project"
:
{
"id"
:
2
,
"description"
:
null
,
"name"
:
"project2"
,
"name_with_namespace"
:
"John Doe8 / project2"
,
"path"
:
"project2"
,
"path_with_namespace"
:
"namespace2/project2"
,
"created_at"
:
"2019-10-11T02:55:54.138Z"
},
"group"
:
{
"id"
:
26
,
...
...
@@ -179,6 +199,7 @@ Example response:
"authorization_type"
:
"rbac"
,
"ca_cert"
:
"-----BEGIN CERTIFICATE-----
\r\n
hFiK1L61owwDQYJKoZIhvcNAQELBQAw
\r\n
LzEtMCsGA1UEAxMkZDA1YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM4ZDBj
\r\n
MB4XDTE4MTIyNzIwMDM1MVoXDTIzMTIyNjIxMDM1MVowLzEtMCsGA1UEAxMkZDA1
\r\n
YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM.......-----END CERTIFICATE-----"
},
"management_project"
:
null
,
"group"
:
{
"id"
:
26
,
...
...
@@ -249,6 +270,16 @@ Example response:
"authorization_type"
:
"rbac"
,
"ca_cert"
:
null
},
"management_project"
:
{
"id"
:
2
,
"description"
:
null
,
"name"
:
"project2"
,
"name_with_namespace"
:
"John Doe8 / project2"
,
"path"
:
"project2"
,
"path_with_namespace"
:
"namespace2/project2"
,
"created_at"
:
"2019-10-11T02:55:54.138Z"
},
"group"
:
{
"id"
:
26
,
...
...
doc/api/project_clusters.md
View file @
5ce01342
...
...
@@ -54,6 +54,16 @@ Example response:
"namespace"
:
"cluster-1-namespace"
,
"authorization_type"
:
"rbac"
,
"ca_cert"
:
"-----BEGIN CERTIFICATE-----
\r\n
hFiK1L61owwDQYJKoZIhvcNAQELBQAw
\r\n
LzEtMCsGA1UEAxMkZDA1YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM4ZDBj
\r\n
MB4XDTE4MTIyNzIwMDM1MVoXDTIzMTIyNjIxMDM1MVowLzEtMCsGA1UEAxMkZDA1
\r\n
YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM.......-----END CERTIFICATE-----"
},
"management_project"
:
{
"id"
:
2
,
"description"
:
null
,
"name"
:
"project2"
,
"name_with_namespace"
:
"John Doe8 / project2"
,
"path"
:
"project2"
,
"path_with_namespace"
:
"namespace2/project2"
,
"created_at"
:
"2019-10-11T02:55:54.138Z"
}
},
{
...
...
@@ -113,6 +123,16 @@ Example response:
"authorization_type"
:
"rbac"
,
"ca_cert"
:
"-----BEGIN CERTIFICATE-----
\r\n
hFiK1L61owwDQYJKoZIhvcNAQELBQAw
\r\n
LzEtMCsGA1UEAxMkZDA1YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM4ZDBj
\r\n
MB4XDTE4MTIyNzIwMDM1MVoXDTIzMTIyNjIxMDM1MVowLzEtMCsGA1UEAxMkZDA1
\r\n
YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM.......-----END CERTIFICATE-----"
},
"management_project"
:
{
"id"
:
2
,
"description"
:
null
,
"name"
:
"project2"
,
"name_with_namespace"
:
"John Doe8 / project2"
,
"path"
:
"project2"
,
"path_with_namespace"
:
"namespace2/project2"
,
"created_at"
:
"2019-10-11T02:55:54.138Z"
},
"project"
:
{
"id"
:
26
,
...
...
@@ -205,6 +225,7 @@ Example response:
"authorization_type"
:
"rbac"
,
"ca_cert"
:
"-----BEGIN CERTIFICATE-----
\r\n
hFiK1L61owwDQYJKoZIhvcNAQELBQAw
\r\n
LzEtMCsGA1UEAxMkZDA1YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM4ZDBj
\r\n
MB4XDTE4MTIyNzIwMDM1MVoXDTIzMTIyNjIxMDM1MVowLzEtMCsGA1UEAxMkZDA1
\r\n
YzQ1YjctNzdiMS00NDY0LThjNmEtMTQ0ZDJkZjM.......-----END CERTIFICATE-----"
},
"management_project"
:
null
,
"project"
:
{
"id"
:
26
,
...
...
@@ -301,6 +322,16 @@ Example response:
"authorization_type"
:
"rbac"
,
"ca_cert"
:
null
},
"management_project"
:
{
"id"
:
2
,
"description"
:
null
,
"name"
:
"project2"
,
"name_with_namespace"
:
"John Doe8 / project2"
,
"path"
:
"project2"
,
"path_with_namespace"
:
"namespace2/project2"
,
"created_at"
:
"2019-10-11T02:55:54.138Z"
},
"project"
:
{
"id"
:
26
,
...
...
lib/api/entities.rb
View file @
5ce01342
...
...
@@ -1813,6 +1813,7 @@ module API
expose
:user
,
using:
Entities
::
UserBasic
expose
:platform_kubernetes
,
using:
Entities
::
Platform
::
Kubernetes
expose
:provider_gcp
,
using:
Entities
::
Provider
::
Gcp
expose
:management_project
,
using:
Entities
::
ProjectIdentity
end
class
ClusterProject
<
Cluster
...
...
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