kubernetes: Remove deprecated spec.externalID
This got marked as deprecated four years ago [1], and finally removed last year [2]. This is not present at all any more in Kubernetes 1.12. This has been identical to `metadata.name` since [1], so just use the latter directly. In the nodes overview list, don't show the name/ID again in the Address column, as that's just redundant: The first column already shows that. So show the actual address instead. [1] https://github.com/kubernetes/kubernetes/pull/7775/files#diff-e58c0c0709cf6f8a3b00aef6069b66b7 [2] https://github.com/kubernetes/kubernetes/pull/60692 Closes #11385
This commit is contained in:
parent
7e4807654c
commit
6319afc24d
|
@ -4,9 +4,6 @@
|
||||||
"metadata": {
|
"metadata": {
|
||||||
"name": "192.168.124.4"
|
"name": "192.168.124.4"
|
||||||
},
|
},
|
||||||
"spec": {
|
|
||||||
"externalID": "192.168.124.4"
|
|
||||||
},
|
|
||||||
"status": {
|
"status": {
|
||||||
"capacity": {
|
"capacity": {
|
||||||
"cpu": "3",
|
"cpu": "3",
|
||||||
|
|
|
@ -164,10 +164,10 @@
|
||||||
|
|
||||||
$scope.jump = function (node) {
|
$scope.jump = function (node) {
|
||||||
var host, ip;
|
var host, ip;
|
||||||
if (!node || !node.spec)
|
if (!node || !node.metadata)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
host = node.spec.externalID;
|
host = node.metadata.name;
|
||||||
ip = nodeData.nodeIPAddress(node);
|
ip = nodeData.nodeIPAddress(node);
|
||||||
|
|
||||||
if (ip == "127.0.0.1" || ip == "::1") {
|
if (ip == "127.0.0.1" || ip == "::1") {
|
||||||
|
@ -421,9 +421,6 @@
|
||||||
"apiVersion": "v1",
|
"apiVersion": "v1",
|
||||||
"metadata": {
|
"metadata": {
|
||||||
"name": name || address,
|
"name": name || address,
|
||||||
},
|
|
||||||
"spec": {
|
|
||||||
"externalID": address
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
defer.resolve(item);
|
defer.resolve(item);
|
||||||
|
|
|
@ -434,8 +434,13 @@ require("./kube-client-mock");
|
||||||
"uid": "6e51438e-d161-11e4-acbc-10c37bdb8410",
|
"uid": "6e51438e-d161-11e4-acbc-10c37bdb8410",
|
||||||
"resourceVersion": "634539",
|
"resourceVersion": "634539",
|
||||||
},
|
},
|
||||||
"spec": {
|
"status": {
|
||||||
"externalID": "172.2.3.1"
|
"addresses": [
|
||||||
|
{
|
||||||
|
"address": "172.2.3.1",
|
||||||
|
"type": "ExternalIP"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
<dd title="{{ item.metadata.creationTimestamp }}">{{ item.metadata.creationTimestamp | dateRelative }}</dd>
|
<dd title="{{ item.metadata.creationTimestamp }}">{{ item.metadata.creationTimestamp | dateRelative }}</dd>
|
||||||
<dt translate>Address</dt>
|
<dt translate>Address</dt>
|
||||||
<dd>
|
<dd>
|
||||||
<a tabindex="0" class="machine-jump" ng-if="item.status.addresses" ng-click="jump(item)">{{item.spec.externalID}}</a>
|
<a tabindex="0" class="machine-jump" ng-if="item.status.addresses" ng-click="jump(item)">{{item.metadata.name}}</a>
|
||||||
<span ng-if="!item.status.addresses">{{item.spec.externalID}}</span>
|
<span ng-if="!item.status.addresses">{{item.metadata.name}}</span>
|
||||||
</dd>
|
</dd>
|
||||||
<dt translate>IP</dt>
|
<dt translate>IP</dt>
|
||||||
<dd ng-if="item.status.addresses">{{ nodeIPAddress(item) }}</dd>
|
<dd ng-if="item.status.addresses">{{ nodeIPAddress(item) }}</dd>
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
<td>
|
<td>
|
||||||
<div ng-if="item.status.nodeInfo.osImage">{{item.status.nodeInfo.osImage}}</div>
|
<div ng-if="item.status.nodeInfo.osImage">{{item.status.nodeInfo.osImage}}</div>
|
||||||
</td>
|
</td>
|
||||||
<td>{{item.spec.externalID}}</td>
|
<td>{{ nodeIPAddress(item) }}</td>
|
||||||
<td>
|
<td>
|
||||||
<span class="spinner-inline node-status" kubernetes-status-icon status="nodeStatusIcon(item)"></span>
|
<span class="spinner-inline node-status" kubernetes-status-icon status="nodeStatusIcon(item)"></span>
|
||||||
{{ nodeStatus(item) }}
|
{{ nodeStatus(item) }}
|
||||||
|
|
Loading…
Reference in New Issue