Skip to content

Commit 95a64e1

Browse files
committed
Merge branch 'develop' into dependa-fix
# Conflicts: # chart-sync/go.mod # chart-sync/go.sum # chart-sync/vendor/modules.txt # ci-runner/go.mod # ci-runner/go.sum # ci-runner/vendor/modules.txt # git-sensor/go.mod # git-sensor/go.sum # git-sensor/vendor/modules.txt # image-scanner/go.mod # image-scanner/go.sum # image-scanner/vendor/modules.txt # kubelink/go.mod # kubelink/go.sum # kubelink/vendor/modules.txt # kubewatch/go.mod # kubewatch/go.sum # kubewatch/vendor/modules.txt # lens/go.mod # lens/go.sum # lens/vendor/modules.txt
2 parents 1b082db + 0608972 commit 95a64e1

25 files changed

Lines changed: 5349 additions & 4255 deletions

File tree

chart-sync/go.mod

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,127 +1,127 @@
11
module github.com/devtron-labs/chart-sync
22

3-
go 1.24.0
3+
go 1.22.4
44

5-
toolchain go1.24.3
5+
toolchain go1.22.6
66

7-
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250601142730-5f74a616a6e1
7+
replace (
8+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250602063450-998593aefb28
9+
helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42
10+
)
811

912
require (
1013
github.com/caarlos0/env v3.5.0+incompatible
11-
github.com/devtron-labs/common-lib v0.19.1
14+
github.com/devtron-labs/common-lib v0.0.0
1215
github.com/ghodss/yaml v1.0.0
1316
github.com/go-pg/pg v6.15.1+incompatible
1417
github.com/google/wire v0.6.0
1518
github.com/pkg/errors v0.9.1
16-
github.com/prometheus/client_golang v1.22.0
17-
go.uber.org/zap v1.27.0
18-
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
19-
helm.sh/helm/v3 v3.18.1
19+
github.com/prometheus/client_golang v1.17.0
20+
go.uber.org/zap v1.21.0
21+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
22+
helm.sh/helm/v3 v3.14.3
2023
)
2124

2225
require (
23-
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
24-
github.com/MakeNowJust/heredoc v1.0.0 // indirect
25-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
26-
github.com/aws/aws-sdk-go v1.55.7 // indirect
26+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
27+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
28+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
29+
github.com/aws/aws-sdk-go v1.44.306 // indirect
2730
github.com/beorn7/perks v1.0.1 // indirect
28-
github.com/blang/semver/v4 v4.0.0 // indirect
29-
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
30-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
31-
github.com/chai2010/gettext-go v1.0.2 // indirect
32-
github.com/containerd/containerd v1.7.27 // indirect
33-
github.com/containerd/errdefs v1.0.0 // indirect
31+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
32+
github.com/containerd/containerd v1.7.20 // indirect
33+
github.com/containerd/errdefs v0.1.0 // indirect
3434
github.com/containerd/log v0.1.0 // indirect
3535
github.com/containerd/platforms v0.2.1 // indirect
36-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
37-
github.com/docker/cli v28.1.1+incompatible // indirect
38-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
39-
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
40-
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
41-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
36+
github.com/davecgh/go-spew v1.1.1 // indirect
37+
github.com/distribution/reference v0.6.0 // indirect
38+
github.com/docker/cli v27.1.0+incompatible // indirect
39+
github.com/docker/distribution v2.8.3+incompatible // indirect
40+
github.com/docker/docker v27.2.0+incompatible // indirect
41+
github.com/docker/docker-credential-helpers v0.7.0 // indirect
42+
github.com/docker/go-connections v0.5.0 // indirect
43+
github.com/docker/go-metrics v0.0.1 // indirect
44+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
45+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
46+
github.com/felixge/httpsnoop v1.0.4 // indirect
4247
github.com/go-errors/errors v1.4.2 // indirect
43-
github.com/go-logr/logr v1.4.2 // indirect
48+
github.com/go-logr/logr v1.3.0 // indirect
4449
github.com/go-logr/stdr v1.2.2 // indirect
45-
github.com/go-openapi/jsonpointer v0.21.1 // indirect
46-
github.com/go-openapi/jsonreference v0.21.0 // indirect
47-
github.com/go-openapi/swag v0.23.1 // indirect
50+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
51+
github.com/go-openapi/jsonreference v0.20.2 // indirect
52+
github.com/go-openapi/swag v0.22.3 // indirect
4853
github.com/gogo/protobuf v1.3.2 // indirect
49-
github.com/google/btree v1.1.3 // indirect
50-
github.com/google/gnostic-models v0.6.9 // indirect
51-
github.com/google/go-cmp v0.7.0 // indirect
54+
github.com/golang/protobuf v1.5.4 // indirect
55+
github.com/google/btree v1.0.1 // indirect
56+
github.com/google/gnostic-models v0.6.8 // indirect
57+
github.com/google/gofuzz v1.2.0 // indirect
5258
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5359
github.com/google/uuid v1.6.0 // indirect
54-
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
55-
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
56-
github.com/hashicorp/errwrap v1.1.0 // indirect
57-
github.com/hashicorp/go-multierror v1.1.1 // indirect
60+
github.com/gorilla/mux v1.8.1 // indirect
61+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
62+
github.com/imdario/mergo v0.3.13 // indirect
5863
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5964
github.com/jinzhu/inflection v1.0.0 // indirect
6065
github.com/jmespath/go-jmespath v0.4.0 // indirect
6166
github.com/josharian/intern v1.0.0 // indirect
6267
github.com/json-iterator/go v1.1.12 // indirect
63-
github.com/klauspost/compress v1.18.0 // indirect
68+
github.com/klauspost/compress v1.17.4 // indirect
6469
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
65-
github.com/mailru/easyjson v0.9.0 // indirect
66-
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
67-
github.com/moby/spdystream v0.5.0 // indirect
68-
github.com/moby/term v0.5.2 // indirect
70+
github.com/mailru/easyjson v0.7.7 // indirect
71+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
72+
github.com/moby/locker v1.0.1 // indirect
73+
github.com/moby/term v0.5.0 // indirect
6974
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7075
github.com/modern-go/reflect2 v1.0.2 // indirect
7176
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7277
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
73-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7478
github.com/nxadm/tail v1.4.8 // indirect
7579
github.com/opencontainers/go-digest v1.0.0 // indirect
76-
github.com/opencontainers/image-spec v1.1.1 // indirect
80+
github.com/opencontainers/image-spec v1.1.0 // indirect
7781
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
78-
github.com/prometheus/client_model v0.6.2 // indirect
79-
github.com/prometheus/common v0.64.0 // indirect
80-
github.com/prometheus/procfs v0.16.1 // indirect
81-
github.com/russross/blackfriday/v2 v2.1.0 // indirect
82+
github.com/prometheus/client_model v0.5.0 // indirect
83+
github.com/prometheus/common v0.44.0 // indirect
84+
github.com/prometheus/procfs v0.11.1 // indirect
8285
github.com/sirupsen/logrus v1.9.3 // indirect
83-
github.com/spf13/cobra v1.9.1 // indirect
84-
github.com/spf13/pflag v1.0.6 // indirect
85-
github.com/x448/float16 v0.8.4 // indirect
86+
github.com/spf13/cobra v1.8.1 // indirect
87+
github.com/spf13/pflag v1.0.5 // indirect
8688
github.com/xlab/treeprint v1.2.0 // indirect
87-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
88-
go.opentelemetry.io/otel v1.36.0 // indirect
89-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
90-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
89+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
90+
go.opentelemetry.io/otel v1.21.0 // indirect
91+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
92+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
93+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
94+
go.uber.org/atomic v1.10.0 // indirect
95+
go.uber.org/goleak v1.2.1 // indirect
9196
go.uber.org/multierr v1.11.0 // indirect
92-
golang.org/x/crypto v0.38.0 // indirect
93-
golang.org/x/net v0.40.0 // indirect
94-
golang.org/x/oauth2 v0.30.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
99-
golang.org/x/time v0.11.0 // indirect
100-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
101-
google.golang.org/grpc v1.72.2 // indirect
102-
google.golang.org/protobuf v1.36.6 // indirect
103-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
97+
golang.org/x/crypto v0.31.0 // indirect
98+
golang.org/x/net v0.33.0 // indirect
99+
golang.org/x/oauth2 v0.21.0 // indirect
100+
golang.org/x/sync v0.10.0 // indirect
101+
golang.org/x/sys v0.28.0 // indirect
102+
golang.org/x/term v0.27.0 // indirect
103+
golang.org/x/text v0.21.0 // indirect
104+
golang.org/x/time v0.3.0 // indirect
105+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
106+
google.golang.org/grpc v1.59.0 // indirect
107+
google.golang.org/protobuf v1.33.0 // indirect
104108
gopkg.in/inf.v0 v0.9.1 // indirect
105109
gopkg.in/yaml.v2 v2.4.0 // indirect
106110
gopkg.in/yaml.v3 v3.0.1 // 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
113-
k8s.io/klog/v2 v2.130.1 // indirect
114-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
115-
k8s.io/kubectl v0.33.0 // indirect
116-
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
111+
k8s.io/api v0.29.7 // indirect
112+
k8s.io/apimachinery v0.29.7 // indirect
113+
k8s.io/cli-runtime v0.29.0 // indirect
114+
k8s.io/client-go v0.29.7 // indirect
115+
k8s.io/klog/v2 v2.110.1 // indirect
116+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
117+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
117118
mellium.im/sasl v0.3.2 // indirect
118-
oras.land/oras-go/v2 v2.5.0 // indirect
119-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
120-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
121-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
122-
sigs.k8s.io/randfill v1.0.0 // indirect
123-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
124-
sigs.k8s.io/yaml v1.4.0 // indirect
119+
oras.land/oras-go v1.2.6 // indirect
120+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
121+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
122+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
123+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
124+
sigs.k8s.io/yaml v1.3.0 // indirect
125125
)
126126

127127
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)