Skip to content

Commit 5bef98e

Browse files
Shivam-nagar23Shivam-nagar23
committed
main sync
2 parents c20b7a5 + 4564399 commit 5bef98e

179 files changed

Lines changed: 5001 additions & 4933 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎chart-sync/App.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package main
33
import (
44
"github.com/devtron-labs/chart-sync/internals"
55
"github.com/devtron-labs/chart-sync/pkg"
6+
"github.com/devtron-labs/common-lib/securestore"
67
"github.com/go-pg/pg"
78
"github.com/prometheus/client_golang/prometheus/promhttp"
89
"go.uber.org/zap"
@@ -22,12 +23,17 @@ func NewApp(Logger *zap.SugaredLogger,
2223
db *pg.DB,
2324
syncService pkg.SyncService,
2425
configuration *internals.Configuration) *App {
26+
err := securestore.SetEncryptionKey()
27+
if err != nil {
28+
Logger.Errorw("error in setting encryption key", "err", err)
29+
}
2530
return &App{
2631
Logger: Logger,
2732
db: db,
2833
syncService: syncService,
2934
configuration: configuration,
3035
}
36+
3137
}
3238

3339
func (app *App) Start() {

‎chart-sync/env_gen.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"Category":"DEVTRON","Fields":[{"Env":"APP","EnvType":"string","EnvValue":"chart-sync","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"APP_STORE_APPLICATION_VERSIONS_SAVE_CHUNK_SIZE","EnvType":"int","EnvValue":"20","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"APP_SYNC_SHUTDOWN_WAIT_DURATION","EnvType":"int","EnvValue":"120","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"CHART_PROVIDER_ID","EnvType":"string","EnvValue":"*","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"IS_OCI_REGISTRY","EnvType":"bool","EnvValue":"true","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"LOG_LEVEL","EnvType":"int","EnvValue":"0","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PARALLELISM_LIMIT_FOR_TAG_PROCESSING","EnvType":"int","EnvValue":"0","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_ADDR","EnvType":"string","EnvValue":"127.0.0.1","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_DATABASE","EnvType":"string","EnvValue":"orchestrator","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_EXPORT_PROM_METRICS","EnvType":"bool","EnvValue":"true","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_LOG_ALL_FAILURE_QUERIES","EnvType":"bool","EnvValue":"true","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_LOG_ALL_QUERY","EnvType":"bool","EnvValue":"false","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_LOG_SLOW_QUERY","EnvType":"bool","EnvValue":"true","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_PASSWORD","EnvType":"string","EnvValue":"password","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_PORT","EnvType":"string","EnvValue":"5432","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_QUERY_DUR_THRESHOLD","EnvType":"int64","EnvValue":"5000","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_USER","EnvType":"string","EnvValue":"user","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PROMETHEUS_MATRIX_PORT","EnvType":"int","EnvValue":"8080","EnvDescription":"","Example":"","Deprecated":"false"}]}]
1+
[{"Category":"DEVTRON","Fields":[{"Env":"APP","EnvType":"string","EnvValue":"chart-sync","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"APP_STORE_APPLICATION_VERSIONS_SAVE_CHUNK_SIZE","EnvType":"int","EnvValue":"20","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"APP_SYNC_SHUTDOWN_WAIT_DURATION","EnvType":"int","EnvValue":"120","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"CHART_PROVIDER_ID","EnvType":"string","EnvValue":"*","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"IS_OCI_REGISTRY","EnvType":"bool","EnvValue":"true","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"LOG_LEVEL","EnvType":"int","EnvValue":"0","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PARALLELISM_LIMIT_FOR_TAG_PROCESSING","EnvType":"int","EnvValue":"0","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_ADDR","EnvType":"string","EnvValue":"127.0.0.1","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_DATABASE","EnvType":"string","EnvValue":"orchestrator","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_EXPORT_PROM_METRICS","EnvType":"bool","EnvValue":"true","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_LOG_ALL_FAILURE_QUERIES","EnvType":"bool","EnvValue":"true","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_LOG_ALL_QUERY","EnvType":"bool","EnvValue":"false","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_LOG_SLOW_QUERY","EnvType":"bool","EnvValue":"true","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_PASSWORD","EnvType":"string","EnvValue":"password","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_PORT","EnvType":"string","EnvValue":"5432","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_QUERY_DUR_THRESHOLD","EnvType":"int64","EnvValue":"5000","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_USER","EnvType":"string","EnvValue":"user","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PROMETHEUS_MATRIX_PORT","EnvType":"int","EnvValue":"8080","EnvDescription":"","Example":"","Deprecated":"false"}]},{"Category":"POSTGRES","Fields":[{"Env":"CASBIN_DATABASE","EnvType":"string","EnvValue":"casbin","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_READ_TIMEOUT","EnvType":"int64","EnvValue":"30","EnvDescription":"","Example":"","Deprecated":"false"},{"Env":"PG_WRITE_TIMEOUT","EnvType":"int64","EnvValue":"30","EnvDescription":"","Example":"","Deprecated":"false"}]}]

‎chart-sync/env_gen.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,11 @@
2222
| PG_USER | string |user | | | false |
2323
| PROMETHEUS_MATRIX_PORT | int |8080 | | | false |
2424

25+
26+
## POSTGRES Related Environment Variables
27+
| Key | Type | Default Value | Description | Example | Deprecated |
28+
|-------|----------|-------------------|-------------------|-----------------------|------------------|
29+
| CASBIN_DATABASE | string |casbin | | | false |
30+
| PG_READ_TIMEOUT | int64 |30 | | | false |
31+
| PG_WRITE_TIMEOUT | int64 |30 | | | false |
32+

‎chart-sync/go.mod‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.0
44

55
toolchain go1.24.3
66

7-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20251027064454-486c150c9341
7+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20251013041509-9d1c5175da2d
88

99
require (
1010
github.com/caarlos0/env v3.5.0+incompatible
@@ -16,7 +16,7 @@ require (
1616
github.com/prometheus/client_golang v1.22.0
1717
go.uber.org/zap v1.27.0
1818
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
19-
helm.sh/helm/v3 v3.18.6
19+
helm.sh/helm/v3 v3.18.1
2020
)
2121

2222
require (
@@ -81,23 +81,21 @@ require (
8181
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8282
github.com/sirupsen/logrus v1.9.3 // indirect
8383
github.com/spf13/cobra v1.9.1 // indirect
84-
github.com/spf13/pflag v1.0.7 // indirect
84+
github.com/spf13/pflag v1.0.6 // indirect
8585
github.com/x448/float16 v0.8.4 // indirect
8686
github.com/xlab/treeprint v1.2.0 // indirect
8787
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
8888
go.opentelemetry.io/otel v1.36.0 // indirect
8989
go.opentelemetry.io/otel/metric v1.36.0 // indirect
9090
go.opentelemetry.io/otel/trace v1.36.0 // indirect
9191
go.uber.org/multierr v1.11.0 // indirect
92-
go.yaml.in/yaml/v2 v2.4.2 // indirect
93-
go.yaml.in/yaml/v3 v3.0.3 // indirect
94-
golang.org/x/crypto v0.40.0 // indirect
95-
golang.org/x/net v0.41.0 // indirect
92+
golang.org/x/crypto v0.38.0 // indirect
93+
golang.org/x/net v0.40.0 // indirect
9694
golang.org/x/oauth2 v0.30.0 // indirect
97-
golang.org/x/sync v0.16.0 // indirect
98-
golang.org/x/sys v0.34.0 // indirect
99-
golang.org/x/term v0.33.0 // indirect
100-
golang.org/x/text v0.27.0 // indirect
95+
golang.org/x/sync v0.14.0 // indirect
96+
golang.org/x/sys v0.33.0 // indirect
97+
golang.org/x/term v0.32.0 // indirect
98+
golang.org/x/text v0.25.0 // indirect
10199
golang.org/x/time v0.11.0 // indirect
102100
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
103101
google.golang.org/grpc v1.72.2 // indirect
@@ -106,24 +104,24 @@ require (
106104
gopkg.in/inf.v0 v0.9.1 // indirect
107105
gopkg.in/yaml.v2 v2.4.0 // indirect
108106
gopkg.in/yaml.v3 v3.0.1 // indirect
109-
k8s.io/api v0.33.3 // indirect
110-
k8s.io/apiextensions-apiserver v0.33.3 // indirect
111-
k8s.io/apimachinery v0.33.3 // indirect
112-
k8s.io/cli-runtime v0.33.3 // indirect
113-
k8s.io/client-go v0.33.3 // indirect
114-
k8s.io/component-base v0.33.3 // indirect
107+
k8s.io/api v0.33.0 // indirect
108+
k8s.io/apiextensions-apiserver v0.33.0 // indirect
109+
k8s.io/apimachinery v0.33.0 // indirect
110+
k8s.io/cli-runtime v0.33.0 // indirect
111+
k8s.io/client-go v0.33.0 // indirect
112+
k8s.io/component-base v0.33.0 // indirect
115113
k8s.io/klog/v2 v2.130.1 // indirect
116114
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
117-
k8s.io/kubectl v0.33.3 // indirect
115+
k8s.io/kubectl v0.33.0 // indirect
118116
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
119117
mellium.im/sasl v0.3.2 // indirect
120-
oras.land/oras-go/v2 v2.6.0 // indirect
118+
oras.land/oras-go/v2 v2.5.0 // indirect
121119
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
122120
sigs.k8s.io/kustomize/api v0.19.0 // indirect
123121
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
124122
sigs.k8s.io/randfill v1.0.0 // indirect
125123
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
126-
sigs.k8s.io/yaml v1.5.0 // indirect
124+
sigs.k8s.io/yaml v1.4.0 // indirect
127125
)
128126

129127
replace github.com/devtron-labs/chart-sync => github.com/devtron-labs/devtron-services/chart-sync v0.0.0-20241024131256-7d3ba621dece

0 commit comments

Comments
 (0)