Skip to content

Commit 5431e48

Browse files
authored
Cluster host changes to read os name from currentOs (#253)
1 parent c247f4c commit 5431e48

10 files changed

Lines changed: 16 additions & 10 deletions

File tree

apps/cluster-orch/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.27-dev
1+
2.0.27

apps/cluster-orch/deploy/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ apiVersion: v2
44
name: orch-ui-cluster-orch
55
description: Deploy the Edge Orchestrator cluster-orch pod
66
type: application
7-
version: 2.0.27-dev
7+
version: 2.0.27
88
# Default appVersion will be overwritten by a the build to use the version from package.json.
99

1010
# This value is supplied only to enable local unbuilt deployment of released content.
11-
appVersion: "2.0.27-dev"
11+
appVersion: "2.0.27"
1212
annotations: {}
1313
dependencies: []

apps/cluster-orch/src/components/organism/ClusterNodesTable/ClusterNodesTable.pom.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ const endpoints: CyApiDetails<
3333
sha256: "sha",
3434
updateSources: [],
3535
},
36+
currentOs: {
37+
name: "linux",
38+
sha256: "sha",
39+
updateSources: [],
40+
},
3641
},
3742
},
3843
],

apps/cluster-orch/src/components/organism/ClusterNodesTable/ClusterNodesTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ const ClusterNodesTable = ({
123123
readinessType === "cluster" ? statusCluster : statusHost,
124124
{
125125
Header: "Operating System",
126-
accessor: (node) => node.instance?.os?.name ?? "-",
126+
accessor: (node) => node.instance?.currentOs?.name ?? "-",
127127
},
128128
{
129129
Header: "Trusted Compute",

apps/cluster-orch/src/components/organism/cluster/clusterCreation/ClusterNodesTableBySite/ClusterNodesTableBySite.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ const ClusterNodesTableBySite = ({
296296
},
297297
{
298298
Header: "Operating System",
299-
accessor: (host) => host.instance?.os?.name ?? "-",
299+
accessor: (host) => host.instance?.currentOs?.name ?? "-",
300300
},
301301
{
302302
Header: "Role*",

apps/cluster-orch/src/utils/NodeTableColumns.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const guid: TableColumn<cm.NodeInfo> = {
6969

7070
const os: TableColumn<CombinedNodeHostItem> = {
7171
Header: "Operating System",
72-
accessor: (nodes) => nodes.instance?.os?.name ?? "-",
72+
accessor: (nodes) => nodes.instance?.currentOs?.name ?? "-",
7373
};
7474

7575
const role: TableColumn<CombinedNodeHostItem> = {

apps/infra/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.26
1+
1.0.27

apps/infra/deploy/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ apiVersion: v2
44
name: orch-ui-infra
55
description: Deploy the Edge-Native Software Platform Infrastructure pod
66
type: application
7-
version: 1.0.26
7+
version: 1.0.27
88
# Default appVersion will be overwritten by a the build to use the version from package.json.
99

10-
appVersion: "1.0.26"
10+
appVersion: "1.0.27"
1111
dependencies: []
1212
annotations: {}

apps/infra/src/components/organism/hosts/HostDetailsTab/HostDetailsTab.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ const HostDetailsTab: React.FC<HostDetailsTabProps> = (props) => {
181181
<b>UUID</b>
182182
<div>{host.uuid ?? "N/A"}</div>
183183
<b>OS</b>
184-
<div>{host.instance?.os?.name ?? "N/A"}</div>
184+
<div>{host.instance?.currentOs?.name ?? "N/A"}</div>
185185
<b>Bios Vendor</b>
186186
<div>{host.biosVendor ?? "N/A"}</div>
187187
<b>Product Name</b>

library/utils/mocks/infra/store/instances.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ export const provisionedInstanceOne: enhancedInfraSlice.InstanceReadModified = {
214214
kind: "INSTANCE_KIND_METAL",
215215
desiredState: "INSTANCE_STATE_RUNNING",
216216
os: osUbuntu,
217+
currentOs: osUbuntu,
217218
};
218219

219220
export const provisionedInstanceTwo: enhancedInfraSlice.InstanceReadModified = {

0 commit comments

Comments
 (0)