mirror/helm-dashboard
1
0
Fork 0
mirror of https://github.com/komodorio/helm-dashboard.git synced 2026-03-24 11:48:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong deployemnt status

Browse Source
This commit is contained in:
Andrei Pohilko
2022-09-20 12:41:06 +01:00
parent ccb2836791
commit ea6e4d55b0
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/dashboard/data.go
View File

@@ -321,6 +321,15 @@ func (d *DataLayer) GetResource(namespace string, def *GenericResource) (*Generi
} }
sort.Slice(res.Status.Conditions, func(i, j int) bool { sort.Slice(res.Status.Conditions, func(i, j int) bool {
// some condition types always bubble up
if res.Status.Conditions[i].Type == "Available" {
return false
}
if res.Status.Conditions[j].Type == "Available" {
return true
}
t1 := res.Status.Conditions[i].LastTransitionTime t1 := res.Status.Conditions[i].LastTransitionTime
t2 := res.Status.Conditions[j].LastTransitionTime t2 := res.Status.Conditions[j].LastTransitionTime
return t1.Time.Before(t2.Time) return t1.Time.Before(t2.Time)

1
pkg/dashboard/static/scripts.js
View File

@@ -305,7 +305,6 @@ function popUpUpgrade(self, verCur, elm) {
let url = "/api/helm/charts/install?namespace=" + getHashParam("namespace") + "&name=" + name + "&chart=" + elm.name; let url = "/api/helm/charts/install?namespace=" + getHashParam("namespace") + "&name=" + name + "&chart=" + elm.name;
$('#upgradeModalLabel select').data("url", url) $('#upgradeModalLabel select').data("url", url)
self.prop("disabled", true)
$("#upgradeModalLabel .name").text(name) $("#upgradeModalLabel .name").text(name)
$("#upgradeModalLabel .ver-old").text(verCur) $("#upgradeModalLabel .ver-old").text(verCur)