Skip to content

Commit 60cf925

Browse files
ayu-devtronayu-devtron
authored
Merge pull request #113 from devtron-labs/pg-enable-init-fix
fix: Pg enable init fix
2 parents adc0455 + df255a6 commit 60cf925

File tree

30 files changed

+35
-48
lines changed

30 files changed

+35
-48
lines changed

‎chart-sync/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.4
55
toolchain go1.22.6
66

77
replace (
8-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113070633-ed74310744db
8+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113160456-05b845b3dc5c
99
helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42
1010
)
1111

‎chart-sync/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
5454
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5555
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
5656
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
57-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113070633-ed74310744db h1:zDiN8JiwxaR5tshM+P2krTXy5yHKeZNiIni8qFUikRI=
58-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113070633-ed74310744db/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
57+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113160456-05b845b3dc5c h1:mf8nKtNtQhBSWDTZrtlbix+htxZFEKJv6EDNSnF0XzA=
58+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113160456-05b845b3dc5c/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
5959
github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY=
6060
github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE=
6161
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=

‎chart-sync/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎chart-sync/vendor/modules.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ github.com/containerd/platforms
9393
# github.com/davecgh/go-spew v1.1.1
9494
## explicit
9595
github.com/davecgh/go-spew/spew
96-
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113070633-ed74310744db
96+
# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113160456-05b845b3dc5c
9797
## explicit; go 1.21
9898
github.com/devtron-labs/common-lib/git-manager/util
9999
github.com/devtron-labs/common-lib/helmLib/registry
@@ -789,4 +789,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
789789
# sigs.k8s.io/yaml v1.3.0
790790
## explicit; go 1.12
791791
sigs.k8s.io/yaml
792-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113070633-ed74310744db
792+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113160456-05b845b3dc5c

‎ci-runner/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.21
44

55
toolchain go1.21.8
66

7-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113070633-ed74310744db
7+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113160456-05b845b3dc5c
88

99
require (
1010
github.com/Knetic/govaluate v3.0.0+incompatible

‎ci-runner/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
5757
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5858
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
5959
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
60-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113070633-ed74310744db h1:zDiN8JiwxaR5tshM+P2krTXy5yHKeZNiIni8qFUikRI=
61-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113070633-ed74310744db/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
60+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113160456-05b845b3dc5c h1:mf8nKtNtQhBSWDTZrtlbix+htxZFEKJv6EDNSnF0XzA=
61+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113160456-05b845b3dc5c/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
6262
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
6363
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
6464
github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=

‎ci-runner/vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci-runner/vendor/modules.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2
118118
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
119119
## explicit
120120
github.com/davecgh/go-spew/spew
121-
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113070633-ed74310744db
121+
# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113160456-05b845b3dc5c
122122
## explicit; go 1.21
123123
github.com/devtron-labs/common-lib/blob-storage
124124
github.com/devtron-labs/common-lib/constants
@@ -860,4 +860,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
860860
# sigs.k8s.io/yaml v1.3.0
861861
## explicit; go 1.12
862862
sigs.k8s.io/yaml
863-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113070633-ed74310744db
863+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113160456-05b845b3dc5c

‎common-lib/utils/CommonUtils.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ func GetSelfK8sPodName() string {
147147
return os.Getenv(DEVTRON_SELF_POD_NAME)
148148
}
149149

150-
// TODO: how to separate this service-wise ?
151150
var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{
152151
Name: "pg_query_duration_seconds",
153152
Help: "Duration of PG queries",

‎git-sensor/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.21
44

55
toolchain go1.22.4
66

7-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113070633-ed74310744db
7+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250113160456-05b845b3dc5c
88

99
require (
1010
github.com/caarlos0/env v3.5.0+incompatible

0 commit comments

Comments
 (0)