Skip to content

Commit 31937c1

Browse files
authored
Merge pull request #176 from devtron-labs/dependa-fix
fix: upgraded to docker v27.2.0+incompatible
2 parents 12abbff + d2df5e9 commit 31937c1

File tree

344 files changed

+5784
-11851
lines changed

Some content is hidden

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

344 files changed

+5784
-11851
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21 AS build-env
1+
FROM golang:1.22 AS build-env
22

33
RUN apt update
44
RUN apt install git gcc musl-dev make -y

go.mod

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
module github.com/devtron-labs/kubelink
22

3-
go 1.21
3+
go 1.22.4
4+
5+
toolchain go1.22.6
46

57
require (
68
github.com/caarlos0/env v3.5.0+incompatible
79
github.com/davecgh/go-spew v1.1.1
810
github.com/devtron-labs/authenticator v0.4.34
9-
github.com/devtron-labs/common-lib v0.0.25-0.20240812113340-f14be466613d
11+
github.com/devtron-labs/common-lib v0.16.1-0.20240904133334-7918e7c25b63
1012
github.com/evanphx/json-patch v5.7.0+incompatible
1113
github.com/go-pg/pg v6.15.1+incompatible
1214
github.com/golang/protobuf v1.5.4
1315
github.com/google/wire v0.6.0
14-
github.com/gorilla/mux v1.8.0
16+
github.com/gorilla/mux v1.8.1
1517
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1
1618
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
17-
github.com/prometheus/client_golang v1.16.0
18-
github.com/stretchr/testify v1.8.4
19+
github.com/prometheus/client_golang v1.17.0
20+
github.com/stretchr/testify v1.9.0
1921
go.uber.org/zap v1.21.0
2022
golang.org/x/sync v0.7.0
21-
google.golang.org/grpc v1.58.3
23+
google.golang.org/grpc v1.59.0
2224
google.golang.org/protobuf v1.33.0
2325
helm.sh/helm/v3 v3.14.3
2426
k8s.io/api v0.29.0
@@ -40,25 +42,26 @@ require (
4042
github.com/Masterminds/semver/v3 v3.2.1 // indirect
4143
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
4244
github.com/Masterminds/squirrel v1.5.4 // indirect
43-
github.com/Microsoft/hcsshim v0.11.4 // indirect
4445
github.com/arl/statsviz v0.6.0 // indirect
4546
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
4647
github.com/aws/aws-sdk-go v1.44.285 // indirect
4748
github.com/beorn7/perks v1.0.1 // indirect
4849
github.com/caarlos0/env/v6 v6.7.2 // indirect
4950
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5051
github.com/chai2010/gettext-go v1.0.2 // indirect
51-
github.com/containerd/containerd v1.7.12 // indirect
52+
github.com/containerd/containerd v1.7.20 // indirect
53+
github.com/containerd/errdefs v0.1.0 // indirect
5254
github.com/containerd/log v0.1.0 // indirect
55+
github.com/containerd/platforms v0.2.1 // indirect
5356
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
5457
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
55-
github.com/docker/cli v24.0.6+incompatible // indirect
56-
github.com/docker/distribution v2.8.2+incompatible // indirect
57-
github.com/docker/docker v24.0.9+incompatible // indirect
58+
github.com/distribution/reference v0.6.0 // indirect
59+
github.com/docker/cli v27.1.0+incompatible // indirect
60+
github.com/docker/distribution v2.8.3+incompatible // indirect
61+
github.com/docker/docker v27.2.0+incompatible // indirect
5862
github.com/docker/docker-credential-helpers v0.7.0 // indirect
59-
github.com/docker/go-connections v0.4.0 // indirect
63+
github.com/docker/go-connections v0.5.0 // indirect
6064
github.com/docker/go-metrics v0.0.1 // indirect
61-
github.com/docker/go-units v0.5.0 // indirect
6265
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
6366
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
6467
github.com/fatih/color v1.13.0 // indirect
@@ -81,7 +84,7 @@ require (
8184
github.com/google/go-cmp v0.6.0 // indirect
8285
github.com/google/gofuzz v1.2.0 // indirect
8386
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
84-
github.com/google/uuid v1.3.0 // indirect
87+
github.com/google/uuid v1.6.0 // indirect
8588
github.com/gorilla/websocket v1.5.0 // indirect
8689
github.com/gosuri/uitable v0.0.4 // indirect
8790
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
@@ -95,7 +98,7 @@ require (
9598
github.com/jmoiron/sqlx v1.3.5 // indirect
9699
github.com/josharian/intern v1.0.0 // indirect
97100
github.com/json-iterator/go v1.1.12 // indirect
98-
github.com/klauspost/compress v1.16.7 // indirect
101+
github.com/klauspost/compress v1.17.4 // indirect
99102
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
100103
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
101104
github.com/lib/pq v1.10.9 // indirect
@@ -115,7 +118,6 @@ require (
115118
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
116119
github.com/modern-go/reflect2 v1.0.2 // indirect
117120
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
118-
github.com/morikuni/aec v1.0.0 // indirect
119121
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
120122
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
121123
github.com/nats-io/jwt/v2 v2.5.2 // indirect
@@ -124,29 +126,29 @@ require (
124126
github.com/nats-io/nuid v1.0.1 // indirect
125127
github.com/onsi/ginkgo v1.16.5 // indirect
126128
github.com/opencontainers/go-digest v1.0.0 // indirect
127-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
129+
github.com/opencontainers/image-spec v1.1.0 // indirect
128130
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
129131
github.com/pkg/errors v0.9.1 // indirect
130132
github.com/pmezard/go-difflib v1.0.0 // indirect
131133
github.com/pquerna/cachecontrol v0.1.0 // indirect
132-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
134+
github.com/prometheus/client_model v0.5.0 // indirect
133135
github.com/prometheus/common v0.44.0 // indirect
134136
github.com/prometheus/procfs v0.11.1 // indirect
135137
github.com/rubenv/sql-migrate v1.5.2 // indirect
136138
github.com/russross/blackfriday/v2 v2.1.0 // indirect
137139
github.com/shopspring/decimal v1.3.1 // indirect
138140
github.com/sirupsen/logrus v1.9.3 // indirect
139141
github.com/spf13/cast v1.5.0 // indirect
140-
github.com/spf13/cobra v1.8.0 // indirect
142+
github.com/spf13/cobra v1.8.1 // indirect
141143
github.com/spf13/pflag v1.0.5 // indirect
142144
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
143145
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
144146
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
145147
github.com/xlab/treeprint v1.2.0 // indirect
146-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
147-
go.opentelemetry.io/otel v1.19.0 // indirect
148-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
149-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
148+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
149+
go.opentelemetry.io/otel v1.21.0 // indirect
150+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
151+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
150152
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
151153
go.uber.org/atomic v1.10.0 // indirect
152154
go.uber.org/multierr v1.11.0 // indirect
@@ -157,7 +159,7 @@ require (
157159
golang.org/x/term v0.22.0 // indirect
158160
golang.org/x/text v0.16.0 // indirect
159161
golang.org/x/time v0.3.0 // indirect
160-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
162+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
161163
gopkg.in/inf.v0 v0.9.1 // indirect
162164
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
163165
gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -174,7 +176,7 @@ require (
174176
k8s.io/metrics v0.29.0 // indirect
175177
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
176178
mellium.im/sasl v0.3.1 // indirect
177-
oras.land/oras-go v1.2.4 // indirect
179+
oras.land/oras-go v1.2.6 // indirect
178180
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
179181
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
180182
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)