Skip to content
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9ea572b
Add infra ref kind to clusters api response and clusters details ui
ranatrk Aug 16, 2022
19447d5
Add test for capicluster with infrastructure ref object
ranatrk Aug 17, 2022
4e648b0
Remove unused ui code
ranatrk Aug 17, 2022
12c4177
Merge branch 'main' into 1165-add-infraref-kind
ranatrk Aug 17, 2022
380dc5e
Add check for InfrastructureRef in spec before adding it in AddCAPICl…
ranatrk Aug 17, 2022
374b768
Merge branch 'main' into 1165-add-infraref-kind
ranatrk Aug 17, 2022
63d721a
Regenerate clusters services after merge with main
ranatrk Aug 17, 2022
364c442
Cleanup code
ranatrk Aug 17, 2022
5bcf9cb
Remove extra space in import
ranatrk Aug 17, 2022
18784ca
Apply suggestions from code review
ranatrk Aug 18, 2022
99d9dd1
Add missing import of InfoField
ranatrk Aug 18, 2022
80eab98
Addinfraref api version to cluster dashboard FE
ranatrk Aug 21, 2022
db8aca6
WIP Add icons to cluster items in cluster list FE
ranatrk Aug 21, 2022
f02d6cc
Merge branch 'main' into 1165-add-infraref-kind
ranatrk Aug 21, 2022
cd43826
Update cluster type icon check function
ranatrk Aug 21, 2022
5f2277d
add cluster kind icon beside cluster name
Aug 21, 2022
d24a70b
Add check for cluster annotations kind when adding cluster icon
ranatrk Aug 22, 2022
13e2ad2
add kind cluster icon
Aug 24, 2022
8fe2cc0
Merge branch 'main' into 1165-add-infraref-kind
ranatrk Aug 25, 2022
40050b3
Add non colored kubernetes, GKE ,and EKS logos in cluster list icons
ranatrk Aug 25, 2022
53376fd
Merge branch 'main' into 1165-add-infraref-kind
ranatrk Aug 25, 2022
9b0bfcc
Regenerate proto files
ranatrk Aug 25, 2022
057b8e5
Remove unused Clusters import
ranatrk Aug 25, 2022
02fa57c
Apply suggestions from code review
ranatrk Aug 28, 2022
96bd1b3
Add tooltip on cluster kind icon
ranatrk Aug 28, 2022
e563371
Clean up unused function
ranatrk Aug 28, 2022
d325eb0
Merge branch 'main' into 1165-add-infraref-kind
ranatrk Aug 28, 2022
889b6ed
generate proto files
ranatrk Aug 28, 2022
1640761
Merge branch 'main' into 1165-add-infraref-kind
ranatrk Aug 30, 2022
e5f7627
generate proto files
ranatrk Aug 30, 2022
a6a1efb
generate proto files
ranatrk Aug 30, 2022
803c2bd
Merge branch 'main' into 1165-add-infraref-kind
ranatrk Aug 30, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cmd/clusters-service/api/cluster_services.proto
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,7 @@ message CapiCluster {
map<string, string> annotations = 3;
map<string, string> labels = 4;
CapiClusterStatus status = 5;
CapiClusterInfrastructureRef infrastructureRef = 6;
}

message CapiClusterStatus {
Expand All @@ -421,6 +422,12 @@ message CapiClusterStatus {
int64 observedGeneration = 6;
}

message CapiClusterInfrastructureRef {
string apiVersion = 1;
string kind = 2;
string name = 3;
}

message GitopsClusterRef { string name = 1; }

message Credential {
Expand Down
17 changes: 17 additions & 0 deletions cmd/clusters-service/api/cluster_services.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,23 @@
},
"status": {
"$ref": "#/definitions/v1CapiClusterStatus"
},
"infrastructureRef": {
"$ref": "#/definitions/v1CapiClusterInfrastructureRef"
}
}
},
"v1CapiClusterInfrastructureRef": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string"
},
"kind": {
"type": "string"
},
"name": {
"type": "string"
}
}
},
Expand Down
Loading