Skip to content

misc: Main merge oss 2025 1 #360

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

Merged
prakash100198 merged 26 commits into from
Dec 1, 2025
Merged

misc: Main merge oss 2025 1 #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
85c2218
go get helm.sh/helm/v3
prkhrkat Sep 2, 2025
ff08ef4
common-lib sync
prkhrkat Sep 2, 2025
f85a365
misc: Dependa fix (#327)
prkhrkat Sep 2, 2025
37fc24d
Merge branch 'develop' into dependa-fix
prkhrkat Sep 3, 2025
9f4c85c
common-lib sync
prkhrkat Sep 3, 2025
ca209fc
Merge pull request #330 from devtron-labs/dependa-fix
prkhrkat Sep 4, 2025
eaf5009
argo-version update
prkhrkat Sep 8, 2025
6614f25
Merge pull request #331 from devtron-labs/argo-version-update
prkhrkat Sep 8, 2025
9e49667
eks-detection
prkhrkat Sep 10, 2025
a3bfb12
Merge pull request #332 from devtron-labs/eks-detection
prkhrkat Sep 11, 2025
486c150
main sync
Shivam-nagar23 Oct 27, 2025
c20b7a5
main sync
Shivam-nagar23 Oct 27, 2025
5bef98e
main sync
Shivam-nagar23 Oct 27, 2025
bf0ba87
main sync dep update oss
Shivam-nagar23 Oct 27, 2025
733d943
main sync dep update oss
Shivam-nagar23 Oct 27, 2025
2031d81
Merge pull request #350 from devtron-labs/main-sync-27-10
Shivam-nagar23 Oct 27, 2025
89e00c5
main sync common lib
kartik-579 Nov 4, 2025
2b571e9
vendor files
kartik-579 Nov 4, 2025
1f7627e
Merge pull request #352 from devtron-labs/common-lib-main-sync-4nov-1
kartik-579 Nov 4, 2025
4d6710b
updated develop hash
kartik-579 Nov 4, 2025
f40094e
Merge pull request #353 from devtron-labs/develop-hash-sync-4nov-1
kartik-579 Nov 4, 2025
d6692a4
Merge pull request #355 from devtron-labs/release-candidate-v0.43.0
Shivam-nagar23 Nov 21, 2025
ea8533f
merge main
prakash100198 Nov 28, 2025
714a309
make dep-update-oss
prakash100198 Nov 28, 2025
9be3566
Merge branch 'kubecon-2025' into main-merge-oss-2025-1
prakash100198 Nov 30, 2025
956e28f
extend(pubsub): add GPU installation topic configurations and update …
prakash100198 Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

TARGET_BRANCH?=main
TARGET_BRANCH?=develop
# TARGET_BRANCH=feature-branch make dep-update-oss

all: dep-update-oss build
Expand Down
40 changes: 21 additions & 19 deletions chart-sync/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.24.0

toolchain go1.24.3

replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20251014073045-3bf681471b22
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20251130063045-9be3566113e5

require (
github.com/caarlos0/env v3.5.0+incompatible
Expand All @@ -16,7 +16,7 @@ require (
github.com/prometheus/client_golang v1.22.0
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
helm.sh/helm/v3 v3.18.1
helm.sh/helm/v3 v3.18.6
)

require (
Expand Down Expand Up @@ -71,7 +71,7 @@ require (
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
Expand All @@ -81,21 +81,23 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cobra v1.9.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/spf13/pflag v1.0.7 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/otel v1.36.0 // indirect
go.opentelemetry.io/otel/metric v1.36.0 // indirect
go.opentelemetry.io/otel/trace v1.36.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.38.0 // indirect
golang.org/x/net v0.40.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.3 // indirect
golang.org/x/crypto v0.40.0 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.14.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.25.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.34.0 // indirect
golang.org/x/term v0.33.0 // indirect
golang.org/x/text v0.27.0 // indirect
golang.org/x/time v0.11.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
google.golang.org/grpc v1.72.2 // indirect
Expand All @@ -104,24 +106,24 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.33.0 // indirect
k8s.io/apiextensions-apiserver v0.33.0 // indirect
k8s.io/apimachinery v0.33.0 // indirect
k8s.io/cli-runtime v0.33.0 // indirect
k8s.io/client-go v0.33.0 // indirect
k8s.io/component-base v0.33.0 // indirect
k8s.io/api v0.33.3 // indirect
k8s.io/apiextensions-apiserver v0.33.3 // indirect
k8s.io/apimachinery v0.33.3 // indirect
k8s.io/cli-runtime v0.33.3 // indirect
k8s.io/client-go v0.33.3 // indirect
k8s.io/component-base v0.33.3 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
k8s.io/kubectl v0.33.0 // indirect
k8s.io/kubectl v0.33.3 // indirect
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
mellium.im/sasl v0.3.2 // indirect
oras.land/oras-go/v2 v2.5.0 // indirect
oras.land/oras-go/v2 v2.6.0 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/kustomize/api v0.19.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
sigs.k8s.io/yaml v1.5.0 // indirect
)

replace github.com/devtron-labs/chart-sync => github.com/devtron-labs/devtron-services/chart-sync v0.0.0-20241024131256-7d3ba621dece
121 changes: 83 additions & 38 deletions chart-sync/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions chart-sync/vendor/github.com/spf13/pflag/README.md
View file
Open in desktop

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

40 changes: 40 additions & 0 deletions chart-sync/vendor/github.com/spf13/pflag/bool_func.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion chart-sync/vendor/github.com/spf13/pflag/count.go
View file
Open in desktop

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

149 changes: 149 additions & 0 deletions chart-sync/vendor/github.com/spf13/pflag/errors.go
View file
Open in desktop

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

Loading
Loading