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)
This commit is contained in:
Daan Hoogland 2024-04-23 15:49:53 +02:00
commit 65eef59e0b
4 changed files with 26 additions and 3 deletions

View File

@ -320,3 +320,4 @@ jobs:
flags: simulator-marvin-tests
verbose: true
name: codecov
token: ${{ secrets.CODECOV_TOKEN }}

View File

@ -53,6 +53,7 @@ jobs:
with:
files: ./client/target/site/jacoco-aggregate/jacoco.xml
fail_ci_if_error: true
flags: unit-tests
flags: unittests
verbose: true
name: codecov
token: ${{ secrets.CODECOV_TOKEN }}

View File

@ -63,3 +63,4 @@ jobs:
flags: uitests
verbose: true
name: codecov
token: ${{ secrets.CODECOV_TOKEN }}

View File

@ -205,7 +205,7 @@ export default {
virtualmachines: [],
vmColumns: [],
networkLoading: false,
network: {},
network: null,
publicIpAddress: null,
currentTab: 'details',
cksSshStartingPort: 2222,
@ -386,7 +386,27 @@ export default {
this.virtualmachines.map(x => { x.ipaddress = x.nic[0].ipaddress })
this.instanceLoading = false
},
fetchPublicIpAddress () {
fetchNetwork () {
this.networkLoading = true
return new Promise((resolve, reject) => {
api('listNetworks', {
listAll: true,
id: this.resource.networkid
}).then(json => {
const networks = json.listnetworksresponse.network
if (this.arrayHasItems(networks)) {
this.network = networks[0]
}
})
this.networkLoading = false
})
},
async fetchPublicIpAddress () {
await this.fetchNetwork()
if (this.network && this.network.type === 'Shared') {
this.publicIpAddress = null
return
}
this.networkLoading = true
var params = {
listAll: true,