Merge pull request ceph#53022 from rhcs-dashboard/upgrade-start-enhan…

…cement mgr/dashboard: support cluster upgrade even if the check for upgrade fails Reviewed-by: cloudbehl <NOT@FOUND> Reviewed-by: Nizamudeen A <[email protected]>
ibm-s390-cloud · Aug 17, 2023 · 82e2614 · 82e2614
2 parents 9640080 + 014421e
commit 82e2614
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/...ard/frontend/src/app/ceph/cluster/upgrade/upgrade-form/upgrade-start-modal.component.html b/...ard/frontend/src/app/ceph/cluster/upgrade/upgrade-form/upgrade-start-modal.component.html
@@ -14,7 +14,8 @@
                         spacingClass="mb-3"
                         *ngIf="showImageField"
                         i18n>Make sure to put the correct image. Passing an incorrect image can lead the cluster into an undesired state.</cd-alert-panel>
-        <div class="form-group row">
+        <div *ngIf="versions"
+             class="form-group row">
           <label class="cd-col-form-label"
                  [ngClass]="{'required': !showImageField}"
                  for="availableVersions"
@@ -42,7 +43,8 @@
           </div>
         </div>
 
-        <div class="form-group row">
+        <div *ngIf="versions"
+             class="form-group row">
           <div class="cd-col-form-offset">
             <div class="custom-control custom-checkbox">
               <input type="checkbox"
@@ -60,7 +62,7 @@
 
         <!-- Custom image name input-->
         <div class="form-group row"
-             *ngIf="showImageField">
+             *ngIf="showImageField || !versions">
           <label class="cd-col-form-label required"
                  for="customImageName"
                  i18n>Image</label>

diff --git a/...board/frontend/src/app/ceph/cluster/upgrade/upgrade-form/upgrade-start-modal.component.ts b/...board/frontend/src/app/ceph/cluster/upgrade/upgrade-form/upgrade-start-modal.component.ts
@@ -44,6 +44,13 @@ export class UpgradeStartModalComponent implements OnInit {
       useImage: new FormControl(false),
       customImageName: new FormControl(null)
     });
+    if (this.versions === undefined) {
+      const availableVersionsControl = this.upgradeForm.get('availableVersions');
+      availableVersionsControl.clearValidators();
+      const customImageNameControl = this.upgradeForm.get('customImageName');
+      customImageNameControl.setValidators(Validators.required);
+      customImageNameControl.updateValueAndValidity();
+    }
   }
 
   startUpgrade() {

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.html
@@ -157,6 +157,9 @@ <h5>
        class="text-success"></i>
     Cluster is up-to-date
   </span>
+  <a class="link-primary mb-2"
+     (click)="startUpgradeModal()"
+     i18n>Upgrade using custom image...</a>
 </ng-template>
 
 <ng-template #warningIcon>
@@ -197,6 +200,9 @@ <h5>
       <i [ngClass]="[icons.danger]"></i>
       {{ errorMessage }}
     </span>
+    <a class="link-primary mb-2"
+       (click)="startUpgradeModal()"
+       i18n>Upgrade using custom image...</a>
   </div>
 </ng-template>