Skip to content

Commit 02d8db0

Browse files
authored
chore(deps): update github.com/canonical/lxd (#3088)
* chore(deps): patch github.com/canonical/lxd * f * f
1 parent 788c252 commit 02d8db0

File tree

9 files changed

+113
-115
lines changed

9 files changed

+113
-115
lines changed

dev/dockerfiles/local-artifact-mirror/Dockerfile.ttlsh

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

33
WORKDIR /app
44

dev/dockerfiles/operator/Dockerfile.local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25.2-alpine AS build
1+
FROM golang:1.25.3-alpine AS build
22

33
RUN apk add --no-cache ca-certificates curl git make bash helm
44

dev/dockerfiles/operator/Dockerfile.ttlsh

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

33
WORKDIR /app
44

e2e/cluster/lxd/cluster.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@ func CopyFilesToNode(in *ClusterInput, node string) {
465465
if err != nil {
466466
in.T.Fatalf("Failed to connect to LXD: %v", err)
467467
}
468-
req := lxd.ContainerFileArgs{Mode: 0700, Type: "directory"}
469-
if err = client.CreateContainerFile(node, "/root/.ssh", req); err != nil {
468+
req := lxd.InstanceFileArgs{Mode: 0700, Type: "directory"}
469+
if err = client.CreateInstanceFile(node, "/root/.ssh", req); err != nil {
470470
in.T.Fatalf("Failed to create directory: %v", err)
471471
}
472472
files := []File{
@@ -662,12 +662,12 @@ func CopyFileToNode(in *ClusterInput, node string, file File) {
662662
in.T.Fatalf("Failed to open file %s: %v", file.SourcePath, err)
663663
}
664664
defer fp.Close()
665-
req := lxd.ContainerFileArgs{
665+
req := lxd.InstanceFileArgs{
666666
Content: fp,
667667
Mode: file.Mode,
668668
Type: "file",
669669
}
670-
if err := client.CreateContainerFile(node, file.DestPath, req); err != nil {
670+
if err := client.CreateInstanceFile(node, file.DestPath, req); err != nil {
671671
in.T.Fatalf("Failed to copy file `%s` to `%s` on node %s: %v", file.SourcePath, file.DestPath, node, err)
672672
}
673673
}
@@ -678,7 +678,7 @@ func CopyFileFromNode(node, source, dest string) error {
678678
if err != nil {
679679
return fmt.Errorf("failed to connect to LXD: %v", err)
680680
}
681-
content, _, err := client.GetContainerFile(node, source)
681+
content, _, err := client.GetInstanceFile(node, source)
682682
if err != nil {
683683
return fmt.Errorf("failed to get file %s: %v", source, err)
684684
}

go.mod

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/replicatedhq/embedded-cluster
22

3-
go 1.25.2
3+
go 1.25.3
44

55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.7
@@ -13,7 +13,7 @@ require (
1313
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.13
1414
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.5
1515
github.com/bombsimon/logrusr/v4 v4.1.0
16-
github.com/canonical/lxd v0.0.0-20241030172432-dee0d04b56ee
16+
github.com/canonical/lxd v0.0.0-20251020131417-2c7a72f62ebd
1717
github.com/containers/image/v5 v5.36.2
1818
github.com/coreos/go-systemd/v22 v22.6.0
1919
github.com/creack/pty v1.1.24
@@ -61,7 +61,7 @@ require (
6161
k8s.io/client-go v0.34.1
6262
k8s.io/component-helpers v0.34.1
6363
k8s.io/kubectl v0.34.1
64-
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
64+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
6565
oras.land/oras-go/v2 v2.6.0
6666
sigs.k8s.io/controller-runtime v0.22.3
6767
sigs.k8s.io/yaml v1.6.0
@@ -86,7 +86,7 @@ require (
8686
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
8787
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
8888
github.com/BurntSushi/toml v1.5.0 // indirect
89-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
89+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
9090
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
9191
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
9292
github.com/KyleBanks/depth v1.2.1 // indirect
@@ -122,7 +122,8 @@ require (
122122
github.com/chai2010/gettext-go v1.0.2 // indirect
123123
github.com/chzyer/readline v1.5.1 // indirect
124124
github.com/cilium/ebpf v0.19.0 // indirect
125-
github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
125+
github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
126+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
126127
github.com/containerd/cgroups/v3 v3.0.5 // indirect
127128
github.com/containerd/containerd v1.7.28 // indirect
128129
github.com/containerd/continuity v0.4.5 // indirect
@@ -160,7 +161,7 @@ require (
160161
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
161162
github.com/go-errors/errors v1.4.2 // indirect
162163
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
163-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
164+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
164165
github.com/go-logr/stdr v1.2.2 // indirect
165166
github.com/go-logr/zapr v1.3.0 // indirect
166167
github.com/go-ole/go-ole v1.3.0 // indirect
@@ -196,7 +197,7 @@ require (
196197
github.com/gosimple/unidecode v1.0.1 // indirect
197198
github.com/gosuri/uitable v0.0.4 // indirect
198199
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
199-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
200+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
200201
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 // indirect
201202
github.com/hashicorp/errwrap v1.1.0 // indirect
202203
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -228,8 +229,8 @@ require (
228229
github.com/mailru/easyjson v0.9.0 // indirect
229230
github.com/manifoldco/promptui v0.9.0 // indirect
230231
github.com/mattn/go-colorable v0.1.14 // indirect
231-
github.com/mattn/go-runewidth v0.0.16 // indirect
232-
github.com/mattn/go-sqlite3 v1.14.28 // indirect
232+
github.com/mattn/go-runewidth v0.0.19 // indirect
233+
github.com/mattn/go-sqlite3 v1.14.32 // indirect
233234
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
234235
github.com/microsoft/go-mssqldb v1.9.3 // indirect
235236
github.com/miekg/dns v1.1.68 // indirect
@@ -259,20 +260,19 @@ require (
259260
github.com/opencontainers/selinux v1.12.0 // indirect
260261
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
261262
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
262-
github.com/pkg/sftp v1.13.7 // indirect
263-
github.com/pkg/xattr v0.4.10 // indirect
263+
github.com/pkg/sftp v1.13.9 // indirect
264+
github.com/pkg/xattr v0.4.12 // indirect
264265
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
265266
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
266267
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
267268
github.com/proglottis/gpgme v0.1.4 // indirect
268-
github.com/prometheus/client_golang v1.22.0 // indirect
269+
github.com/prometheus/client_golang v1.23.2 // indirect
269270
github.com/prometheus/client_model v0.6.2 // indirect
270-
github.com/prometheus/common v0.65.0 // indirect
271-
github.com/prometheus/procfs v0.15.1 // indirect
272-
github.com/rivo/uniseg v0.4.7 // indirect
271+
github.com/prometheus/common v0.67.1 // indirect
272+
github.com/prometheus/procfs v0.17.0 // indirect
273273
github.com/rubenv/sql-migrate v1.8.0 // indirect
274274
github.com/russross/blackfriday/v2 v2.1.0 // indirect
275-
github.com/sagikazarmark/locafero v0.11.0 // indirect
275+
github.com/sagikazarmark/locafero v0.12.0 // indirect
276276
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
277277
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
278278
github.com/segmentio/ksuid v1.0.4 // indirect
@@ -283,7 +283,6 @@ require (
283283
github.com/sigstore/protobuf-specs v0.4.1 // indirect
284284
github.com/sigstore/sigstore v1.9.5 // indirect
285285
github.com/smallstep/pkcs7 v0.1.1 // indirect
286-
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
287286
github.com/spf13/afero v1.15.0 // indirect
288287
github.com/spf13/cast v1.10.0 // indirect
289288
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
@@ -308,14 +307,14 @@ require (
308307
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
309308
github.com/yusufpapurcu/wmi v1.2.4 // indirect
310309
github.com/zeebo/errs v1.4.0 // indirect
311-
github.com/zitadel/logging v0.6.1 // indirect
312-
github.com/zitadel/oidc/v3 v3.31.0 // indirect
313-
github.com/zitadel/schema v1.3.0 // indirect
310+
github.com/zitadel/logging v0.6.2 // indirect
311+
github.com/zitadel/oidc/v3 v3.45.0 // indirect
312+
github.com/zitadel/schema v1.3.1 // indirect
314313
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
315314
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
316315
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
317316
go.opencensus.io v0.24.0 // indirect
318-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
317+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
319318
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
320319
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
321320
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
@@ -326,22 +325,22 @@ require (
326325
go.opentelemetry.io/otel/trace v1.38.0 // indirect
327326
go.uber.org/automaxprocs v1.6.0 // indirect
328327
go.uber.org/zap v1.27.0 // indirect
329-
go.yaml.in/yaml/v2 v2.4.2 // indirect
330-
golang.org/x/mod v0.28.0 // indirect
331-
golang.org/x/net v0.45.0 // indirect
332-
golang.org/x/oauth2 v0.30.0 // indirect
328+
go.yaml.in/yaml/v2 v2.4.3 // indirect
329+
golang.org/x/mod v0.29.0 // indirect
330+
golang.org/x/net v0.46.0 // indirect
331+
golang.org/x/oauth2 v0.32.0 // indirect
333332
golang.org/x/sync v0.17.0 // indirect
334333
golang.org/x/sys v0.37.0 // indirect
335334
golang.org/x/text v0.30.0 // indirect
336335
golang.org/x/time v0.12.0 // indirect
337-
golang.org/x/tools v0.37.0 // indirect
336+
golang.org/x/tools v0.38.0 // indirect
338337
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
339338
google.golang.org/api v0.241.0 // indirect
340339
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
341-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
342-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
343-
google.golang.org/grpc v1.73.0 // indirect
344-
google.golang.org/protobuf v1.36.7 // indirect
340+
google.golang.org/genproto/googleapis/api v0.0.0-20251014184007-4626949a642f // indirect
341+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f // indirect
342+
google.golang.org/grpc v1.76.0 // indirect
343+
google.golang.org/protobuf v1.36.10 // indirect
345344
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
346345
gopkg.in/inf.v0 v0.9.1 // indirect
347346
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)