Skip to content
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

Jump to bottom

fix: kubernetes events fix for resources #4247

Merged
merged 3 commits into from
Nov 16, 2023
Merged

fix: kubernetes events fix for resources #4247

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
620c3f1
update common-lib version with for event listing fix
gireesh-devtron Nov 16, 2023
2866d3a
common-lib version update
gireesh-devtron Nov 16, 2023
72c2fd9
query fix
gireesh-devtron Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/davecgh/go-spew v1.1.1
github.com/deckarep/golang-set v1.8.0
github.com/devtron-labs/authenticator v0.4.31
github.com/devtron-labs/common-lib v0.0.5
github.com/devtron-labs/common-lib v0.0.7-0.20231116073034-de159815f217
github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
Expand Down
6 changes: 6 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,12 @@ github.com/devtron-labs/authenticator v0.4.31 h1:CEMLek3JnMuH9ULsC6BHNJr+NiyGzBd
github.com/devtron-labs/authenticator v0.4.31/go.mod h1:ozNfT8WcruiSgnUbyp48WVfc41++W6xYXhKFp67lNTU=
github.com/devtron-labs/common-lib v0.0.5 h1:Y9FqAWhpdbIuRVLp75adSK55sh3H/rOt4zgPrvgLH4Q=
github.com/devtron-labs/common-lib v0.0.5/go.mod h1:x6OdUIo2z9kxXtBfz7fJEfD4s8kiAtEmlApozOf7ECM=
github.com/devtron-labs/common-lib v0.0.6 h1:pbFER0Op9hWQXWRlmQGF8XMctG05tj2eWhUw+lhjPS0=
github.com/devtron-labs/common-lib v0.0.6/go.mod h1:x6OdUIo2z9kxXtBfz7fJEfD4s8kiAtEmlApozOf7ECM=
github.com/devtron-labs/common-lib v0.0.7-0.20231116065433-cb0da4b34b69 h1:nt7l476p/gwTeJ9RxU5bJ/0fJyUkx2bdIZVnyQLwtHI=
github.com/devtron-labs/common-lib v0.0.7-0.20231116065433-cb0da4b34b69/go.mod h1:x6OdUIo2z9kxXtBfz7fJEfD4s8kiAtEmlApozOf7ECM=
github.com/devtron-labs/common-lib v0.0.7-0.20231116073034-de159815f217 h1:tFi7BDTVDlyQmTTKnAzEBH0cB6dCpvsC34Cl6pyiUWg=
github.com/devtron-labs/common-lib v0.0.7-0.20231116073034-de159815f217/go.mod h1:x6OdUIo2z9kxXtBfz7fJEfD4s8kiAtEmlApozOf7ECM=
github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2 h1:/IEIsJTxDZ3hv8uOoCaqdWCXqcv7nCAgX9AP/v84dUY=
github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2/go.mod h1:l85jxWHlcSo910hdUfRycL40yGzC6glE93V1sVxVPto=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
Expand Down
6 changes: 3 additions & 3 deletions internal/sql/repository/CiArtifactsListingQueryBuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ const EmptyLikeRegex = "%%"

func BuildQueryForParentTypeCIOrWebhook(listingFilterOpts bean.ArtifactsListFilterOptions) string {
commonPaginatedQueryPart := ""
if listingFilterOpts.SearchString != EmptyLikeRegex {
commonPaginatedQueryPart = fmt.Sprintf(" cia.image LIKE '%v' ", listingFilterOpts.SearchString)
}
//if listingFilterOpts.SearchString != EmptyLikeRegex {
commonPaginatedQueryPart = fmt.Sprintf(" cia.image LIKE '%v' ", listingFilterOpts.SearchString)
//}
orderByClause := " ORDER BY cia.id DESC"
limitOffsetQueryPart := fmt.Sprintf(" LIMIT %v OFFSET %v", listingFilterOpts.Limit, listingFilterOpts.Offset)
finalQuery := ""
Expand Down
20 changes: 17 additions & 3 deletions vendor/github.com/devtron-labs/common-lib/utils/k8s/K8sUtil.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions vendor/github.com/devtron-labs/common-lib/utils/k8s/bean.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions vendor/github.com/devtron-labs/common-lib/utils/k8s/commonBean/bean.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ github.com/devtron-labs/authenticator/jwt
github.com/devtron-labs/authenticator/middleware
github.com/devtron-labs/authenticator/oidc
github.com/devtron-labs/authenticator/password
# github.com/devtron-labs/common-lib v0.0.5
# github.com/devtron-labs/common-lib v0.0.7-0.20231116073034-de159815f217
## explicit; go 1.20
github.com/devtron-labs/common-lib/blob-storage
github.com/devtron-labs/common-lib/pubsub-lib
Expand Down Expand Up @@ -872,7 +872,6 @@ github.com/robfig/cron/v3
github.com/russross/blackfriday
# github.com/samber/lo v1.38.1
## explicit; go 1.18
github.com/samber/lo
# github.com/satori/go.uuid v1.2.0
## explicit
github.com/satori/go.uuid
Expand Down