Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 8a337c5

Browse files
resolving installer status report after upgrade (#214)
1 parent 2ca4643 commit 8a337c5

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

‎electron/app/js/vzInstaller.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@ function _getStatusFromConditions(vzObject, status) {
137137
}
138138

139139
status.payload = latestCondition;
140-
if (latestCondition && latestCondition.type === 'InstallComplete' && Boolean(latestCondition.status)) {
140+
if (latestCondition &&
141+
(latestCondition.type === 'InstallComplete' || latestCondition.type === 'UpgradeComplete') &&
142+
Boolean(latestCondition.status)) {
141143
status.isComplete = true;
142144
status.version = version;
143145
_normalizeVersionData(status);

‎electron/app/locales/en/webui.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,6 +1773,7 @@
17731773

17741774
"vz-application-status-checker-get-status-failed-title-message": "Get Application Status Failed",
17751775
"vz-application-status-checker-get-status-failed-error-message": "Unable to get the application status due to an error: {{error}}.",
1776+
"vz-application-status-checker-validate-ns-failed-error-message": "Unable to get the application status because an error occurred while trying to validate the Kubernetes namespace {{namespace}}: {{error}}.",
17761777
"vz-application-status-checker-application-not-exist-error-message": "Unable to get the application status because the application {{application}} does not exist.",
17771778
"vz-application-status-checker-ns-not-exist-error-message": "Unable to get the application status because the application namespace {{namespace}} does not exist.",
17781779
"vz-application-status-checker-domain-not-exist-error-message": "Unable to get the application status because the domain UID {{domain}} does not exist.",

‎webui/src/js/views/k8s-helper-choose-cluster-dialog.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</div>
1111
<div slot="body">
1212
<div class="oj-panel">
13-
<oj-form-layout max-columns="2" direction="row">
13+
<oj-form-layout max-columns="1" direction="row">
1414
<oj-select-single label-hint="[[labelMapper('name-label')]]"
1515
value="{{selectedTestClusterName}}"
1616
data="{{testClusterNamesDP}}"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /