From 0de469ab731b903f51598f61527f870f5994fc84 Mon Sep 17 00:00:00 2001 From: dahn Date: Tue, 23 Apr 2024 13:28:09 +0200 Subject: [PATCH 1/2] Infra25725 add codecov token to workflow (#8960) --- .github/workflows/ci.yml | 1 + .github/workflows/codecov.yml | 3 ++- .github/workflows/ui.yml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63f1085d406..87edfe890b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -319,3 +319,4 @@ jobs: flags: simulator-marvin-tests verbose: true name: codecov + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index f7b28fdeecc..4a748c2350a 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -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 }} diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml index 4d89977adf9..b3230eeaca3 100644 --- a/.github/workflows/ui.yml +++ b/.github/workflows/ui.yml @@ -63,3 +63,4 @@ jobs: flags: uitests verbose: true name: codecov + token: ${{ secrets.CODECOV_TOKEN }} From 65f57124f5dffa5e62302bd2fe5c59f2ab9578a5 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 23 Apr 2024 15:12:57 +0200 Subject: [PATCH 2/2] UI: ignore error when list public ips for CKS clusters on Shared network (#8489) --- ui/src/views/compute/KubernetesServiceTab.vue | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/ui/src/views/compute/KubernetesServiceTab.vue b/ui/src/views/compute/KubernetesServiceTab.vue index 96a99586db9..de5617cfcf1 100644 --- a/ui/src/views/compute/KubernetesServiceTab.vue +++ b/ui/src/views/compute/KubernetesServiceTab.vue @@ -204,7 +204,7 @@ export default { virtualmachines: [], vmColumns: [], networkLoading: false, - network: {}, + network: null, publicIpAddress: null, currentTab: 'details', cksSshStartingPort: 2222, @@ -382,7 +382,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,