Skip to content

Commit b8a70bd

Browse files
Ash-expAsh-exp
committed
Merge remote-tracking branch 'origin/develop' into fix/buildx-liveness-dailer
2 parents e93b081 + f33193c commit b8a70bd

487 files changed

Lines changed: 119334 additions & 6924 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/go.mod‎

Lines changed: 1 addition & 1 deletion
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-20250702060842-d55c3f381071
7+
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707130239-f33193c0c8ba
88

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

‎chart-sync/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
4343
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4444
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
4545
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
46-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702060842-d55c3f381071 h1:sUKjL8YRwiXnlDMgDysvp2tYymCLfBRePTRaHQAz7Nw=
47-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702060842-d55c3f381071/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
46+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707130239-f33193c0c8ba h1:5CaruhrzP+xlrIea9TABL1+g6M7ya1PmNAuMC7WaY7g=
47+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707130239-f33193c0c8ba/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
4848
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
4949
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
5050
github.com/distribution/distribution/v3 v3.0.0 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN6UX90KJc4HjyM=

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

Lines changed: 6 additions & 5 deletions
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
@@ -95,7 +95,7 @@ github.com/containerd/platforms
9595
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
9696
## explicit
9797
github.com/davecgh/go-spew/spew
98-
# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702060842-d55c3f381071
98+
# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707130239-f33193c0c8ba
9999
## explicit; go 1.24.0
100100
github.com/devtron-labs/common-lib/constants
101101
github.com/devtron-labs/common-lib/fetchAllEnv
@@ -967,4 +967,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
967967
sigs.k8s.io/yaml
968968
sigs.k8s.io/yaml/goyaml.v2
969969
sigs.k8s.io/yaml/goyaml.v3
970-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702060842-d55c3f381071
970+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707130239-f33193c0c8ba

‎ci-runner/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ require (
1616
github.com/otiai10/copy v1.14.1
1717
golang.org/x/sync v0.14.0
1818
gopkg.in/yaml.v2 v2.4.0
19-
k8s.io/api v0.33.1
2019
k8s.io/apimachinery v0.33.1
2120
k8s.io/client-go v0.33.1
22-
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
2321
)
2422

2523
require (
@@ -151,8 +149,10 @@ require (
151149
gopkg.in/inf.v0 v0.9.1 // indirect
152150
gopkg.in/yaml.v3 v3.0.1 // indirect
153151
gotest.tools/v3 v3.5.1 // indirect
152+
k8s.io/api v0.33.1 // indirect
154153
k8s.io/klog/v2 v2.130.1 // indirect
155154
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
155+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
156156
mellium.im/sasl v0.3.2 // indirect
157157
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
158158
sigs.k8s.io/randfill v1.0.0 // indirect

‎ci-runner/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
114114
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
115115
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
116116
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
117-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702060842-d55c3f381071 h1:sUKjL8YRwiXnlDMgDysvp2tYymCLfBRePTRaHQAz7Nw=
118-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702060842-d55c3f381071/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
117+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250703034313-6e26d7880667 h1:mV+gq9St5soJPS7vww0cWTW6ayKxDVKWmJVkhbkrtjM=
118+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250703034313-6e26d7880667/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
119119
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
120120
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
121121
github.com/docker/cli v28.1.1+incompatible h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5MdSpiItp8k=

‎ci-runner/util/Util.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const (
4242
)
4343

4444
const (
45+
SSH_TUNNELING_STEP = "SSH Tunneling"
4546
PREPARE_STEP = "Git cloning & preparing docker"
4647
CACHE_PULL = "Pulling Cache"
4748
GIT_CLONE_CHECKOUT = "Git Clone & Checkout"

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

Lines changed: 6 additions & 5 deletions
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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ github.com/cncf/xds/go/xds/type/v3
298298
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
299299
## explicit
300300
github.com/davecgh/go-spew/spew
301-
# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702060842-d55c3f381071
301+
# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250703034313-6e26d7880667
302302
## explicit; go 1.24.0
303303
github.com/devtron-labs/common-lib/blob-storage
304304
github.com/devtron-labs/common-lib/constants
@@ -313,8 +313,6 @@ github.com/devtron-labs/common-lib/utils
313313
github.com/devtron-labs/common-lib/utils/bean
314314
github.com/devtron-labs/common-lib/utils/dockerOperations
315315
github.com/devtron-labs/common-lib/utils/remoteConnection/bean
316-
github.com/devtron-labs/common-lib/utils/retryFunc
317-
github.com/devtron-labs/common-lib/utils/runTime
318316
github.com/devtron-labs/common-lib/utils/workFlow
319317
github.com/devtron-labs/common-lib/workflow
320318
# github.com/distribution/reference v0.6.0
@@ -1127,7 +1125,6 @@ k8s.io/client-go/features
11271125
k8s.io/client-go/gentype
11281126
k8s.io/client-go/kubernetes/scheme
11291127
k8s.io/client-go/kubernetes/typed/apps/v1
1130-
k8s.io/client-go/kubernetes/typed/core/v1
11311128
k8s.io/client-go/openapi
11321129
k8s.io/client-go/pkg/apis/clientauthentication
11331130
k8s.io/client-go/pkg/apis/clientauthentication/install
@@ -1140,7 +1137,6 @@ k8s.io/client-go/rest/watch
11401137
k8s.io/client-go/testing
11411138
k8s.io/client-go/tools/clientcmd/api
11421139
k8s.io/client-go/tools/metrics
1143-
k8s.io/client-go/tools/reference
11441140
k8s.io/client-go/transport
11451141
k8s.io/client-go/util/apply
11461142
k8s.io/client-go/util/cert
@@ -1198,4 +1194,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
11981194
## explicit; go 1.12
11991195
sigs.k8s.io/yaml
12001196
sigs.k8s.io/yaml/goyaml.v2
1201-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702060842-d55c3f381071
1197+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250703034313-6e26d7880667

‎common-lib/constants/constants.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ func (m ServiceName) ToString() string {
3030
}
3131

3232
const (
33-
Orchestrator ServiceName = "ORCHESTRATOR"
34-
Kubelink ServiceName = "KUBELINK"
35-
GitSensor ServiceName = "GITSENSOR"
36-
Kubewatch ServiceName = "KUBEWATCH"
37-
ImageScanner ServiceName = "IMAGE_SCANNER"
33+
Orchestrator ServiceName = "ORCHESTRATOR"
34+
Kubelink ServiceName = "KUBELINK"
35+
GitSensor ServiceName = "GITSENSOR"
36+
Kubewatch ServiceName = "KUBEWATCH"
37+
ImageScanner ServiceName = "IMAGE_SCANNER"
38+
ResourceOptimizer ServiceName = "RESOURCE_OPTIMIZER"
3839
)
3940

4041
// metrics name constants

0 commit comments

Comments
 (0)