admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cronjob sort bug, daemonsets status bug, add ingress to v1alpha3 (#2541)

Browse Source 
Signed-off-by: Jeff <zw0948@gmail.com>
This commit is contained in:
zryfish
2020-07-22 19:33:25 +08:00
committed by GitHub
parent 1096eb8adb
commit 24c06da9bc
7 changed files with 236 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/models/resources/v1alpha2/cronjob/cronjobs.go
View File

@@ -106,12 +106,16 @@ func (c *cronJobSearcher) Search(namespace string, conditions *params.Conditions
}
}
sort.Slice(result, func(i, j int) bool {
return c.compare(result[i], result[j], orderBy) && !reverse
if reverse {
return !c.compare(result[i], result[j], orderBy)
} else {
return c.compare(result[i], result[j], orderBy)
}
})
r := make([]interface{}, 0)
for _, i := range result {
r = append(r, i)
for i := range result {
r = append(r, result[i])
}
return r, nil
}

7
pkg/models/resources/v1alpha2/interface.go
View File

@@ -140,8 +140,11 @@ func FuzzyMatch(m map[string]string, key, value string) bool {
func ObjectMetaCompare(left, right metav1.ObjectMeta, compareField string) bool {
switch compareField {
case CreateTime:
if left.CreationTimestamp.Equal(&right.CreationTimestamp) {
return strings.Compare(left.Name, right.Name) <= 0
if left.CreationTimestamp.Time.Equal(right.CreationTimestamp.Time) {
if left.Namespace == right.Namespace {
return strings.Compare(left.Name, right.Name) < 0
}
return strings.Compare(left.Namespace, right.Namespace) < 0
}
return left.CreationTimestamp.Time.Before(right.CreationTimestamp.Time)
case Name: