Skip to content

Commit 65eef59

Browse files
committed
Merge release branch 4.19 to main
* 4.19: UI: ignore error when list public ips for CKS clusters on Shared network (#8489) Infra25725 add codecov token to workflow (#8960)
2 parents 6c24ff9 + 80adf5e commit 65eef59

File tree

4 files changed

+26
-3
lines changed

4 files changed

+26
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,3 +320,4 @@ jobs:
320320
flags: simulator-marvin-tests
321321
verbose: true
322322
name: codecov
323+
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codecov.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
with:
5454
files: ./client/target/site/jacoco-aggregate/jacoco.xml
5555
fail_ci_if_error: true
56-
flags: unit-tests
56+
flags: unittests
5757
verbose: true
5858
name: codecov
59+
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ui.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,4 @@ jobs:
6363
flags: uitests
6464
verbose: true
6565
name: codecov
66+
token: ${{ secrets.CODECOV_TOKEN }}

ui/src/views/compute/KubernetesServiceTab.vue

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ export default {
205205
virtualmachines: [],
206206
vmColumns: [],
207207
networkLoading: false,
208-
network: {},
208+
network: null,
209209
publicIpAddress: null,
210210
currentTab: 'details',
211211
cksSshStartingPort: 2222,
@@ -386,7 +386,27 @@ export default {
386386
this.virtualmachines.map(x => { x.ipaddress = x.nic[0].ipaddress })
387387
this.instanceLoading = false
388388
},
389-
fetchPublicIpAddress () {
389+
fetchNetwork () {
390+
this.networkLoading = true
391+
return new Promise((resolve, reject) => {
392+
api('listNetworks', {
393+
listAll: true,
394+
id: this.resource.networkid
395+
}).then(json => {
396+
const networks = json.listnetworksresponse.network
397+
if (this.arrayHasItems(networks)) {
398+
this.network = networks[0]
399+
}
400+
})
401+
this.networkLoading = false
402+
})
403+
},
404+
async fetchPublicIpAddress () {
405+
await this.fetchNetwork()
406+
if (this.network && this.network.type === 'Shared') {
407+
this.publicIpAddress = null
408+
return
409+
}
390410
this.networkLoading = true
391411
var params = {
392412
listAll: true,

0 commit comments

Comments
 (0)