Skip to content

Commit f601e8f

Browse files
committedNov 10, 2024··
node: add support for -o wide when listing nodes
1 parent 2c57dcc commit f601e8f

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed
 

‎internal/adapter/converter/node.go

+12-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"k8s.io/kubernetes/pkg/apis/core"
1313
)
1414

15-
func (converter *DockerAPIConverter) ConvertInfoVersionToNode(info system.Info, version types.Version, startTime time.Time) core.Node {
15+
func (converter *DockerAPIConverter) ConvertInfoVersionToNode(info system.Info, version types.Version, startTime time.Time, serverIpAddr string) core.Node {
1616
return core.Node{
1717
TypeMeta: metav1.TypeMeta{
1818
Kind: "Node",
@@ -37,6 +37,16 @@ func (converter *DockerAPIConverter) ConvertInfoVersionToNode(info system.Info,
3737
ProviderID: "k2d",
3838
},
3939
Status: core.NodeStatus{
40+
Addresses: []core.NodeAddress{
41+
{
42+
Type: core.NodeInternalIP,
43+
Address: serverIpAddr,
44+
},
45+
{
46+
Type: core.NodeExternalIP,
47+
Address: serverIpAddr,
48+
},
49+
},
4050
Conditions: []core.NodeCondition{
4151
{
4252
Type: "Ready",
@@ -55,6 +65,7 @@ func (converter *DockerAPIConverter) ConvertInfoVersionToNode(info system.Info,
5565
MachineID: info.ID,
5666
OperatingSystem: info.OSType,
5767
SystemUUID: info.ID,
68+
OSImage: info.OperatingSystem,
5869
},
5970
Capacity: core.ResourceList{
6071
core.ResourceCPU: *resource.NewQuantity(int64(info.NCPU), resource.DecimalSI),

‎internal/adapter/node.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (adapter *KubeDockerAdapter) getNode(ctx context.Context, nodeName string)
7777
return nil, fmt.Errorf("unable to retrieve docker server version: %w", err)
7878
}
7979

80-
node := adapter.converter.ConvertInfoVersionToNode(info, version, adapter.startTime)
80+
node := adapter.converter.ConvertInfoVersionToNode(info, version, adapter.startTime, adapter.k2dServerConfiguration.ServerIpAddr)
8181
return &node, nil
8282
}
8383

@@ -98,7 +98,7 @@ func (adapter *KubeDockerAdapter) listNodes(ctx context.Context) (core.NodeList,
9898
APIVersion: "v1",
9999
},
100100
Items: []core.Node{
101-
adapter.converter.ConvertInfoVersionToNode(info, version, adapter.startTime),
101+
adapter.converter.ConvertInfoVersionToNode(info, version, adapter.startTime, adapter.k2dServerConfiguration.ServerIpAddr),
102102
},
103103
}, nil
104104
}

0 commit comments

Comments
 (0)
Please sign in to comment.