Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-05-24 01:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(ui): Group by node in pod view not working due to using label rather than metadata.name (#5191)

Browse source 
Signed-off-by: Remington Breeze <remington@breeze.software>
This commit is contained in:
Remington Breeze 2021-01-05 16:33:20 -08:00 committed by GitHub
parent 9c597acaac
commit b0819691d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/application/application.go
View file

@ -245,13 +245,13 @@ func (s *Server) ListNodes(ctx context.Context, q *application.NodeQuery) (*v1.N
items := make([]v1.Node, 0)
for _, n := range nodes {
cur := *n
hostname := cur.ObjectMeta.Labels["kubernetes.io/hostname"]
if !nodeRefs[hostname] {
nodeName := cur.ObjectMeta.Name
if !nodeRefs[nodeName] {
continue
}
items = append(items, v1.Node{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"kubernetes.io/hostname": hostname},
Name: nodeName,
},
Status: v1.NodeStatus{
Capacity: cur.Status.Capacity,

2
ui/src/app/applications/components/application-pod-view/pod-view.tsx
View file

@ -254,7 +254,7 @@ export class PodView extends React.Component<PodViewProps> {
if (sortMode === 'node' && initNodes) {
initNodes.forEach(infraNode => {
const nodeName = infraNode.metadata ? (infraNode.metadata.labels ? infraNode.metadata.labels['kubernetes.io/hostname'] : 'Unknown') : 'Unknown';
const nodeName = infraNode.metadata ? infraNode.metadata.name || 'Unknown' : 'Unknown';
groupRefs[nodeName] = {
...infraNode,
type: 'node',