Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
e477a0e
fix: postgresql skip unique constratints error and handle network con…
Ash-exp Apr 9, 2025
56ed13f
chore: dependency version updated to 'origin/fix-pg-query-matrices'
Ash-exp Apr 9, 2025
f65f6e2
Merge pull request #218 from devtron-labs/fix-pg-query-matrices
Ash-exp Apr 10, 2025
8004df2
fix: panic handling issues
Ash-exp Apr 10, 2025
290ca50
chore: dependency version updated to 'origin/fix-nil-pointer-handling'
Ash-exp Apr 10, 2025
1a2b1d8
Merge pull request #223 from devtron-labs/fix-nil-pointer-handling
Ash-exp Apr 11, 2025
634ac23
main sync develop
vikramdevtron Apr 14, 2025
a0ab9ce
vendor update
vikramdevtron Apr 14, 2025
6076f6f
Merge pull request #225 from devtron-labs/main-sync-develop-14apr
vikramdevtron Apr 14, 2025
ff12a8a
added support for http and scp based git host
Shivam-nagar23 Apr 15, 2025
01c688c
wip: adding anonymoys cert mode and fixes
iamayushm Apr 15, 2025
51f1587
wip
iamayushm Apr 15, 2025
661ce52
wip
iamayushm Apr 15, 2025
33e3930
wip: adding credential type
iamayushm Apr 15, 2025
4400f72
wip
iamayushm Apr 15, 2025
97512f2
wip
iamayushm Apr 15, 2025
c4b807d
develop sync
iamayushm Apr 16, 2025
28f9dd5
dep update
iamayushm Apr 16, 2025
cbbc0af
dep update
iamayushm Apr 16, 2025
1f3e729
dep update
iamayushm Apr 16, 2025
e8d68fb
anonymous handling
iamayushm Apr 16, 2025
8473f5e
Merge branch 'fix-oci-push' into fix-ng-changes
iamayushm Apr 16, 2025
8f7b509
moving anonymous constant
iamayushm Apr 16, 2025
a7fb107
common lib update
iamayushm Apr 16, 2025
9d08e74
async handling
iamayushm Apr 17, 2025
c7b75d2
dep update
iamayushm Apr 21, 2025
1fcc260
dep update
iamayushm Apr 21, 2025
fc0208e
Merge pull request #229 from devtron-labs/fix-ng-changes
iamayushm Apr 21, 2025
63b16d6
main sync develop
vikramdevtron Apr 21, 2025
ad3aa9b
Merge pull request #231 from devtron-labs/main-sync-develop-21apr
vikramdevtron Apr 21, 2025
135b56f
vendor update in develop
vikramdevtron Apr 21, 2025
837cb2b
Merge pull request #232 from devtron-labs/vendor-update-develop-21apr
vikramdevtron Apr 21, 2025
d96061a
fix: conflicting ci/cd events in a multi cluster devtron setup (#212)
Ash-exp Apr 22, 2025
ae32c1e
Merge pull request #233 from devtron-labs/develop-sync-rc-22apr
vikramdevtron Apr 22, 2025
09d88de
fix for async mode change
kartik-579 Apr 23, 2025
674fc28
Merge pull request #235 from devtron-labs/fix-panic
kartik-579 Apr 23, 2025
c5daeae
Merge remote-tracking branch 'origin/main' into chore-rc-main-sync-25…
Ash-exp Apr 25, 2025
45edc27
Merge pull request #237 from devtron-labs/chore-rc-main-sync-25-apr
vikramdevtron Apr 25, 2025
785e802
main sync and vendor update
vikramdevtron Apr 25, 2025
08ed2e1
Merge pull request #238 from devtron-labs/main-sync-rc-25apr
vikramdevtron Apr 25, 2025
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
2 changes: 1 addition & 1 deletion authenticator/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.22.6
require (
github.com/caarlos0/env/v6 v6.7.2
github.com/coreos/go-oidc/v3 v3.11.0
github.com/golang-jwt/jwt/v4 v4.5.1
github.com/golang-jwt/jwt/v4 v4.5.2
github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.8.0
github.com/sirupsen/logrus v1.8.1
Expand Down
4 changes: 2 additions & 2 deletions authenticator/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9
github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
Expand Down
36 changes: 33 additions & 3 deletions authenticator/vendor/github.com/golang-jwt/jwt/v4/parser.go

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

2 changes: 1 addition & 1 deletion authenticator/vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ github.com/go-logr/logr
## explicit; go 1.15
github.com/gogo/protobuf/proto
github.com/gogo/protobuf/sortkeys
# github.com/golang-jwt/jwt/v4 v4.5.1
# github.com/golang-jwt/jwt/v4 v4.5.2
## explicit; go 1.16
github.com/golang-jwt/jwt/v4
# github.com/golang/protobuf v1.5.3
Expand Down
2 changes: 1 addition & 1 deletion chart-sync/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.4
toolchain go1.22.6

replace (
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250415183144-214ff7e2424f
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425061517-45edc2765147
helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42
)

Expand Down
4 changes: 2 additions & 2 deletions chart-sync/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250415183144-214ff7e2424f h1:o8eUXiQxP6k8liKkIwdOVjibZvd+jNvz3U0jqyqXdr8=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250415183144-214ff7e2424f/go.mod h1:ceFKgQ2qm40PR95g5Xp2EClq7nDBKFTcglJ0JdsgClA=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425061517-45edc2765147 h1:g8ry9IOQzcrX4bkzE/jTCRlixarb0FzTt64w8qNd2wA=
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250425061517-45edc2765147/go.mod h1:zkNShlkcHxsmnL0gKNbs0uyRL8lZonGKr5Km63uTLI0=
github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY=
github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ type DockerArtifactStore struct {
Cert string `sql:"cert" json:"cert,omitempty"`
Active bool `sql:"active,notnull" json:"active"`
RemoteConnectionConfigId int `sql:"remote_connection_config_id"`
CredentialsType string `sql:"credentials_type,notnull"`
OCIRegistryConfig []*OCIRegistryConfig
RemoteConnectionConfig *RemoteConnectionConfig
AuditLog
Expand Down
1 change: 1 addition & 0 deletions chart-sync/pkg/registry/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,6 @@ func NewToRegistryConfig(store *sql.DockerArtifactStore) (*registry.Configuratio
RegistryType: string(store.RegistryType),
IsPublicRegistry: store.OCIRegistryConfig[0].IsPublic,
RemoteConnectionConfig: remoteConnectionConfig,
CredentialsType: store.CredentialsType,
}, nil
}

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

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

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

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

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

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

Loading
Loading