Skip to content

Commit

Permalink
Merge pull request rancher#47303 from slickwarren/cwarren/main/fleet-…
Browse files Browse the repository at this point in the history
…and-snapshots

Fleet + snapshot & restore tests
  • Loading branch information
slickwarren authored Oct 11, 2024
2 parents d63fb30 + a1409c9 commit c2a9242
Show file tree
Hide file tree
Showing 23 changed files with 1,271 additions and 642 deletions.
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ replace (

github.com/rancher/rancher/pkg/apis => ./pkg/apis
github.com/rancher/rancher/pkg/client => ./pkg/client

go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0
go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.19.0
Expand Down Expand Up @@ -62,7 +63,7 @@ replace (
require (
github.com/antihax/optional v1.0.0
github.com/rancher/rancher/pkg/apis v0.0.0-20240719121207-baeda6b89fe3
github.com/rancher/shepherd v0.0.0-20241004183019-faafc7321683
github.com/rancher/shepherd v0.0.0-20241010215815-441dd068176e
go.qase.io/client v0.0.0-20231114201952-65195ec001fa
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1524,8 +1524,8 @@ github.com/rancher/rke v1.6.0 h1:fHdygmtPF1cWXuiYXfwgG4hKvt0n4l57SwCxquRJSfs=
github.com/rancher/rke v1.6.0/go.mod h1:5xRbf3L8PxqJRhABjYRfaBqbpVqAnqyH3maUNQEuwvk=
github.com/rancher/saml v0.4.14-rancher3 h1:2NN6cPqm9FJeiT25x8+gLHWGdulsEak33cHRkGaJ5v0=
github.com/rancher/saml v0.4.14-rancher3/go.mod h1:S4+611dxnKt8z/ulbvaJzcgSHsuhjVc1QHNTcr1R7Fw=
github.com/rancher/shepherd v0.0.0-20241004183019-faafc7321683 h1:uBghNPvXjOBGgab+OQ+43ewqbGDHF9+f/9+KB+5uGts=
github.com/rancher/shepherd v0.0.0-20241004183019-faafc7321683/go.mod h1:zekxs8n6YwnsX1i58abObrkWDfdA9O3hV8wQATuS+8o=
github.com/rancher/shepherd v0.0.0-20241010215815-441dd068176e h1:sVkcio4mO8PqcpY1Yh0vHhGskbX1mp82gFgTUWD39Rk=
github.com/rancher/shepherd v0.0.0-20241010215815-441dd068176e/go.mod h1:zekxs8n6YwnsX1i58abObrkWDfdA9O3hV8wQATuS+8o=
github.com/rancher/steve v0.0.0-20240913181958-99e479ba0f08 h1:USBSXHQ76GeX6AFsqO9VvtjT8C5zOBFdqWHkrWbRD40=
github.com/rancher/steve v0.0.0-20240913181958-99e479ba0f08/go.mod h1:lrDjQ2gl+66qIThaaJXl2auC16Ng8Rg9r5ty6ms50P8=
github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20240301001845-4eacc2dabbde h1:x5VZI/0TUx1MeZirh6e0OMAInhCmq6yRvD6897458Ng=
Expand Down
Loading

0 comments on commit c2a9242

Please sign in to comment.