Skip to content

Fix 4.0 domain status due to changes in operator 4.0 #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 31, 2022
Merged

Fix 4.0 domain status due to changes in operator 4.0 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
851a6ef
Fix due to changes in operator 4.0 for domain status no longer have i…
jshum2479 Oct 31, 2022
c771eaf
Fix refactoring error
jshum2479 Oct 31, 2022
93a0c8a
per change request
jshum2479 Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions electron/app/locales/en/webui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,7 @@
"domain-design-domain-status-title": "Domain Status",
"domain-design-domain-status-overallstatus": "Domain Status:",
"domain-design-domain-status-introspectJobFailureCount": "Introspect Job Failure Count:",
"domain-design-domain-status-observedGeneration": "Observed Generation:",
"domain-design-domain-status-message": "Last Error Message:",
"domain-design-domain-status-conditions": "Conditions:",
"domain-design-domain-status-clusterstatus": "Cluster Status:",
Expand Down
5 changes: 4 additions & 1 deletion webui/src/js/utils/k8s-domain-actions-base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@ function (WktActionsBase, project, wktConsole, i18n, projectIo, dialogHelper) {
} else if (completeCondition.status === 'False' && availableCondition.status === 'False') {
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-available',
{reason: latestCondition.reason});
} else {
} else if (completeCondition.status === 'True' && availableCondition.status === 'False') {
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-available',
{reason: latestCondition.reason});
} else {
// should never happened?
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-unknown',
{reason: latestCondition.reason});
Expand Down
15 changes: 14 additions & 1 deletion webui/src/js/viewModels/domain-status-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,26 @@ function(accUtils, ko, jsyaml, i18n, project) {
this.domainServerStatus = '';
this.introspectJobFailureCount = 0;
this.domainHasError = false;
this.isOperatorVersion4orHigher = false;

if (!project.wko.installedVersion.hasValue() ||
window.api.utils.compareVersions(project.wko.installedVersion.value, '4.0.0') >= 0) {
this.isOperatorVersion4orHigher = true;
}

if ('status' in this.domainStatus && 'conditions' in this.domainStatus.status) {
this.domainConditions = this.makeYamlOutput(this.domainStatus.status.conditions);
this.domainClusterStatus = this.makeYamlOutput(this.domainStatus.status.clusters);
this.domainServerStatus = this.makeYamlOutput(this.domainStatus.status.servers);
this.domainName = this.domainStatus.spec.domainUID;
this.introspectJobFailureCount = this.domainStatus.status.introspectJobFailureCount;
if (this.isOperatorVersion4orHigher) {
// 4.0 higher is not named introspectJobFailureCount but observeredGeneation in the status
// text in the diaglog have been changed to Observed Generation to match, this is just a holder of the value
this.introspectJobFailureCount = this.domainStatus.status.observedGeneration;
} else {
this.introspectJobFailureCount = this.domainStatus.status.introspectJobFailureCount;
}

const conditions = this.domainStatus.status.conditions;
conditions.sort((a, b) => {
if ( a.lastTransitionTime < b.lastTransitionTime ){
Expand Down
15 changes: 12 additions & 3 deletions webui/src/js/views/domain-status-dialog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,18 @@
</div>

<div class="oj-panel wkt-notop">
<oj-label for="introspectJobFailureCount">
<oj-bind-text value="{{labelMapper('domain-status-introspectJobFailureCount')}}"></oj-bind-text>
</oj-label>
<oj-bind-if test="[[isOperatorVersion4orHigher === false]]">
<oj-label for="introspectJobFailureCount">
<oj-bind-text value="{{labelMapper('domain-status-introspectJobFailureCount')}}"></oj-bind-text>
</oj-label>
</oj-bind-if>

<oj-bind-if test="[[isOperatorVersion4orHigher === true]]">
<oj-label for="introspectJobFailureCount">
<oj-bind-text value="{{labelMapper('domain-status-observedGeneration')}}"></oj-bind-text>
</oj-label>
</oj-bind-if>

<br>
<oj-input-text id="introspectJobFailureCount" value="{{introspectJobFailureCount}}" readonly="true"></oj-input-text>
</div>
Expand Down