Skip to content

Commit 0c79c7d

Browse files
Update Makefile versions (#519)
Co-authored-by: laverya <2318911+laverya@users.noreply.github.com>
1 parent e635f8f commit 0c79c7d

File tree

3 files changed

+653
-14
lines changed

3 files changed

+653
-14
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARCH := $(shell uname -m)
44
APP_NAME = embedded-cluster
55
ADMIN_CONSOLE_CHART_URL = oci://registry.replicated.com/library
66
ADMIN_CONSOLE_CHART_NAME = admin-console
7-
ADMIN_CONSOLE_CHART_VERSION = 1.108.6
7+
ADMIN_CONSOLE_CHART_VERSION = 1.108.8
88
ADMIN_CONSOLE_IMAGE_OVERRIDE =
99
ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
1010
EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library
@@ -20,8 +20,8 @@ REGISTRY_CHART_URL = https://helm.twun.io
2020
REGISTRY_CHART_NAME = twuni/docker-registry
2121
REGISTRY_CHART_VERSION = 2.2.3
2222
REGISTRY_IMAGE_VERSION = 2.8.3
23-
KUBECTL_VERSION = v1.29.3
24-
K0S_VERSION = v1.29.3+k0s.0
23+
KUBECTL_VERSION = v1.30.0
24+
K0S_VERSION = v1.29.4+k0s.0
2525
K0S_BINARY_SOURCE_OVERRIDE =
2626
TROUBLESHOOT_VERSION = v0.87.0
2727
KOTS_VERSION = v$(shell echo $(ADMIN_CONSOLE_CHART_VERSION) | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/')

go.mod

Lines changed: 172 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/gosimple/slug v1.14.0
1515
github.com/jedib0t/go-pretty v4.3.0+incompatible
1616
github.com/k0sproject/dig v0.2.0
17-
github.com/k0sproject/k0s v1.29.4-0.20240405132100-75c51bdcdc87
17+
github.com/k0sproject/k0s v1.29.5-0.20240418091920-5421d2dc4754
1818
github.com/replicatedhq/embedded-cluster-kinds v1.1.2
1919
github.com/replicatedhq/embedded-cluster-operator v0.27.0
2020
github.com/replicatedhq/embedded-cluster-utils v1.0.0
@@ -27,49 +27,210 @@ require (
2727
golang.org/x/term v0.19.0
2828
gopkg.in/yaml.v2 v2.4.0
2929
gopkg.in/yaml.v3 v3.0.1
30-
k8s.io/api v0.29.3
31-
k8s.io/apimachinery v0.29.3
30+
k8s.io/api v0.29.4
31+
k8s.io/apimachinery v0.29.4
3232
oras.land/oras-go/v2 v2.5.0
3333
sigs.k8s.io/controller-runtime v0.17.3
3434
sigs.k8s.io/yaml v1.4.0
3535
)
3636

3737
require (
38+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
39+
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
40+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
41+
github.com/BurntSushi/toml v1.3.2 // indirect
42+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
43+
github.com/Masterminds/goutils v1.1.1 // indirect
44+
github.com/Masterminds/semver v1.5.0 // indirect
45+
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
46+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
47+
github.com/Masterminds/squirrel v1.5.4 // indirect
48+
github.com/Microsoft/go-winio v0.6.1 // indirect
49+
github.com/Microsoft/hcsshim v0.12.0-rc.3 // indirect
50+
github.com/NYTimes/gziphandler v1.1.1 // indirect
51+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
52+
github.com/avast/retry-go v3.0.0+incompatible // indirect
3853
github.com/beorn7/perks v1.0.1 // indirect
54+
github.com/blang/semver/v4 v4.0.0 // indirect
55+
github.com/bombsimon/logrusr/v4 v4.1.0 // indirect
56+
github.com/carlmjohnson/requests v0.23.5 // indirect
57+
github.com/cavaliergopher/grab/v3 v3.0.1 // indirect
58+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3959
github.com/cespare/xxhash/v2 v2.2.0 // indirect
40-
github.com/containerd/containerd v1.7.14 // indirect
60+
github.com/chai2010/gettext-go v1.0.2 // indirect
61+
github.com/cilium/ebpf v0.12.3 // indirect
62+
github.com/cloudflare/cfssl v1.6.4 // indirect
63+
github.com/containerd/cgroups/v3 v3.0.3 // indirect
64+
github.com/containerd/console v1.0.3 // indirect
65+
github.com/containerd/containerd v1.7.15 // indirect
66+
github.com/containerd/continuity v0.4.2 // indirect
67+
github.com/containerd/errdefs v0.1.0 // indirect
68+
github.com/containerd/fifo v1.1.0 // indirect
69+
github.com/containerd/go-cni v1.1.9 // indirect
70+
github.com/containerd/go-runc v1.1.0 // indirect
71+
github.com/containerd/log v0.1.0 // indirect
72+
github.com/containerd/ttrpc v1.2.3 // indirect
73+
github.com/containerd/typeurl/v2 v2.1.1 // indirect
74+
github.com/containernetworking/cni v1.1.2 // indirect
75+
github.com/containernetworking/plugins v1.2.0 // indirect
4176
github.com/coreos/go-semver v0.3.1 // indirect
4277
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
78+
github.com/daviddengcn/go-colortext v1.0.0 // indirect
79+
github.com/denisbrodbeck/machineid v1.0.1 // indirect
80+
github.com/distribution/reference v0.5.0 // indirect
81+
github.com/docker/cli v25.0.3+incompatible // indirect
82+
github.com/docker/distribution v2.8.3+incompatible // indirect
83+
github.com/docker/docker v25.0.5+incompatible // indirect
84+
github.com/docker/docker-credential-helpers v0.8.1 // indirect
85+
github.com/docker/go-connections v0.5.0 // indirect
86+
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
87+
github.com/docker/go-metrics v0.0.1 // indirect
88+
github.com/docker/go-units v0.5.0 // indirect
89+
github.com/dustin/go-humanize v1.0.1 // indirect
90+
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
91+
github.com/fatih/camelcase v1.0.0 // indirect
92+
github.com/felixge/httpsnoop v1.0.4 // indirect
4393
github.com/frankban/quicktest v1.14.6 // indirect
4494
github.com/fsnotify/fsnotify v1.7.0 // indirect
95+
github.com/fvbommel/sortorder v1.1.0 // indirect
96+
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
97+
github.com/go-errors/errors v1.4.2 // indirect
98+
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
99+
github.com/go-logr/stdr v1.2.2 // indirect
100+
github.com/go-playground/locales v0.14.1 // indirect
101+
github.com/go-playground/universal-translator v0.18.1 // indirect
102+
github.com/go-playground/validator/v10 v10.17.0 // indirect
103+
github.com/gobwas/glob v0.2.3 // indirect
45104
github.com/godbus/dbus/v5 v5.1.0 // indirect
105+
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
46106
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
107+
github.com/google/btree v1.1.2 // indirect
108+
github.com/google/cel-go v0.17.7 // indirect
109+
github.com/google/certificate-transparency-go v1.1.4 // indirect
47110
github.com/google/go-cmp v0.6.0 // indirect
48111
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
112+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
113+
github.com/gorilla/mux v1.8.1 // indirect
114+
github.com/gosuri/uitable v0.0.4 // indirect
115+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
116+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
117+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
118+
github.com/hashicorp/errwrap v1.1.0 // indirect
119+
github.com/hashicorp/go-multierror v1.1.1 // indirect
120+
github.com/huandu/xstrings v1.4.0 // indirect
121+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
122+
github.com/intel/goresctrl v0.3.0 // indirect
123+
github.com/jmoiron/sqlx v1.3.5 // indirect
124+
github.com/jonboulle/clockwork v0.3.0 // indirect
125+
github.com/kardianos/service v1.2.2 // indirect
126+
github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 // indirect
127+
github.com/klauspost/compress v1.17.7 // indirect
128+
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
129+
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
130+
github.com/leodido/go-urn v1.2.4 // indirect
131+
github.com/lib/pq v1.10.9 // indirect
132+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
133+
github.com/lithammer/dedent v1.1.0 // indirect
134+
github.com/logrusorgru/aurora/v3 v3.0.0 // indirect
135+
github.com/mattn/go-sqlite3 v1.14.19 // indirect
49136
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
137+
github.com/mesosphere/toml-merge v0.2.0 // indirect
138+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
139+
github.com/moby/locker v1.0.1 // indirect
140+
github.com/moby/spdystream v0.2.0 // indirect
141+
github.com/moby/sys/mountinfo v0.7.1 // indirect
142+
github.com/moby/sys/sequential v0.5.0 // indirect
143+
github.com/moby/sys/signal v0.7.0 // indirect
144+
github.com/moby/sys/symlink v0.2.0 // indirect
145+
github.com/moby/sys/user v0.1.0 // indirect
146+
github.com/moby/term v0.5.0 // indirect
147+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
148+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
50149
github.com/ohler55/ojg v1.21.4 // indirect
150+
github.com/olekukonko/tablewriter v0.0.5 // indirect
51151
github.com/opencontainers/go-digest v1.0.0 // indirect
52152
github.com/opencontainers/image-spec v1.1.0 // indirect
153+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
154+
github.com/opencontainers/selinux v1.11.0 // indirect
155+
github.com/otiai10/copy v1.14.0 // indirect
156+
github.com/pelletier/go-toml v1.9.5 // indirect
157+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
53158
github.com/prometheus/client_golang v1.18.0 // indirect
54159
github.com/prometheus/client_model v0.5.0 // indirect
55160
github.com/prometheus/common v0.45.0 // indirect
56161
github.com/prometheus/procfs v0.12.0 // indirect
162+
github.com/robfig/cron v1.2.0 // indirect
163+
github.com/rqlite/rqlite v4.6.0+incompatible // indirect
57164
github.com/rs/cors v1.10.1 // indirect
165+
github.com/rubenv/sql-migrate v1.5.2 // indirect
166+
github.com/segmentio/analytics-go v3.1.0+incompatible // indirect
167+
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
168+
github.com/shopspring/decimal v1.3.1 // indirect
169+
github.com/spf13/cast v1.6.0 // indirect
170+
github.com/spf13/cobra v1.8.0 // indirect
171+
github.com/stoewer/go-strcase v1.2.0 // indirect
172+
github.com/urfave/cli v1.22.14 // indirect
173+
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
174+
github.com/vishvananda/netns v0.0.4 // indirect
175+
github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b // indirect
58176
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
59177
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
60178
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
61-
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
62-
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
63-
go.etcd.io/etcd/client/v3 v3.5.12 // indirect
179+
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
180+
github.com/xlab/treeprint v1.2.0 // indirect
181+
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
182+
github.com/zcalusic/sysinfo v1.0.2 // indirect
183+
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
184+
github.com/zmap/zlint/v3 v3.1.0 // indirect
185+
go.etcd.io/bbolt v1.3.9 // indirect
186+
go.etcd.io/etcd/api/v3 v3.5.13 // indirect
187+
go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
188+
go.etcd.io/etcd/client/v2 v2.305.13 // indirect
189+
go.etcd.io/etcd/client/v3 v3.5.13 // indirect
190+
go.etcd.io/etcd/etcdutl/v3 v3.5.13 // indirect
191+
go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect
192+
go.etcd.io/etcd/raft/v3 v3.5.13 // indirect
193+
go.etcd.io/etcd/server/v3 v3.5.13 // indirect
194+
go.opencensus.io v0.24.0 // indirect
195+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
196+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
197+
go.opentelemetry.io/otel v1.24.0 // indirect
198+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
199+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
200+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
201+
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
202+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
203+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
204+
go.starlark.net v0.0.0-20230717150657-8a3343210976 // indirect
64205
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
206+
golang.org/x/mod v0.16.0 // indirect
65207
golang.org/x/sync v0.6.0 // indirect
208+
golang.org/x/tools v0.18.0 // indirect
66209
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
67210
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
68211
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
69212
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
70213
google.golang.org/grpc v1.60.1 // indirect
214+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
71215
helm.sh/helm/v3 v3.14.3 // indirect
72-
k8s.io/component-base v0.29.3 // indirect
216+
k8s.io/apiserver v0.29.4 // indirect
217+
k8s.io/cli-runtime v0.29.4 // indirect
218+
k8s.io/cloud-provider v0.29.4 // indirect
219+
k8s.io/component-base v0.29.4 // indirect
220+
k8s.io/component-helpers v0.29.4 // indirect
221+
k8s.io/controller-manager v0.29.4 // indirect
222+
k8s.io/cri-api v0.29.4 // indirect
223+
k8s.io/kms v0.29.4 // indirect
224+
k8s.io/kubectl v0.29.4 // indirect
225+
k8s.io/kubelet v0.29.4 // indirect
226+
k8s.io/kubernetes v1.29.4 // indirect
227+
k8s.io/metrics v0.29.4 // indirect
228+
k8s.io/mount-utils v0.29.4 // indirect
229+
oras.land/oras-go v1.2.5 // indirect
230+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
231+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
232+
sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3 // indirect
233+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
73234
)
74235

75236
require (
@@ -135,7 +296,7 @@ require (
135296
go.mongodb.org/mongo-driver v1.11.3 // indirect
136297
go.uber.org/multierr v1.11.0 // indirect
137298
go.uber.org/zap v1.26.0 // indirect
138-
golang.org/x/net v0.22.0 // indirect
299+
golang.org/x/net v0.23.0 // indirect
139300
golang.org/x/oauth2 v0.18.0 // indirect
140301
golang.org/x/sys v0.19.0 // indirect
141302
golang.org/x/text v0.14.0 // indirect
@@ -147,8 +308,8 @@ require (
147308
gopkg.in/inf.v0 v0.9.1 // indirect
148309
gopkg.in/macaroon.v2 v2.1.0 // indirect
149310
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
150-
k8s.io/apiextensions-apiserver v0.29.3 // indirect
151-
k8s.io/client-go v0.29.3 // indirect
311+
k8s.io/apiextensions-apiserver v0.29.4 // indirect
312+
k8s.io/client-go v0.29.4 // indirect
152313
k8s.io/klog/v2 v2.120.1 // indirect
153314
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
154315
k8s.io/utils v0.0.0-20231121161247-cf03d44ff3cf // indirect

0 commit comments

Comments
 (0)