Show vm image error message upon each retry failure (#973) (#1119)

show vm image retry failure message in vmimage and upgrade cr (cherry picked from commit b21b351) Co-authored-by: Kuan-Po Tseng <[email protected]>
harvester · Aug 30, 2024 · 0cce0f4 · 0cce0f4
1 parent df5c9d2
commit 0cce0f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/harvester/models/harvesterhci.io.upgrade.js b/pkg/harvester/models/harvesterhci.io.upgrade.js
@@ -121,10 +121,10 @@ export default class HciUpgrade extends HarvesterResource {
  get upgradeImageMessage() {
  const conditions = this?.status?.conditions || [];
  const imageReady = conditions.find( cond => cond.type === 'ImageReady');
- const hasError = imageReady?.status === 'False';
+ const success = imageReady?.status === 'True';
  const message = imageReady?.message || imageReady?.reason;
 
- return hasError ? message : '';
+ return success ? '' : message;
  }
 
  get nodeUpgradeMessage() {

diff --git a/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js b/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js
@@ -136,7 +136,8 @@ export default class HciVmImage extends HarvesterResource {
  const conditions = this?.status?.conditions || [];
  const initialized = conditions.find( cond => cond.type === 'Initialized');
  const imported = conditions.find( cond => cond.type === 'Imported');
- const message = initialized?.message || imported?.message;
+ const retryLimitExceeded = conditions.find( cond => cond.type === 'RetryLimitExceeded');
+ const message = initialized?.message || imported?.message || retryLimitExceeded?.message;
 
  return ucFirst(message);
  }