Skip to content

Commit

Permalink
Merge branch 'main' into err-msg
Browse files Browse the repository at this point in the history
  • Loading branch information
Itxaka authored Dec 23, 2024
2 parents da71f4b + 71e8e5b commit 0774d9b
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 93 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/osv-scanner-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ permissions:

jobs:
scan-pr:
uses: "google/osv-scanner-action/.github/workflows/[email protected].0"
uses: "google/osv-scanner-action/.github/workflows/[email protected].2"
14 changes: 5 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/kairos-io/go-nodepair v0.3.0
github.com/kairos-io/kairos-sdk v0.6.1
github.com/kairos-io/kcrypt v0.12.2
github.com/labstack/echo/v4 v4.13.0
github.com/labstack/echo/v4 v4.13.3
github.com/mitchellh/mapstructure v1.5.0
github.com/mudler/go-pluggable v0.0.0-20230126220627-7710299a0ae5
github.com/mudler/go-processmanager v0.0.0-20240820160718-8b802d3ecf82
Expand All @@ -29,11 +29,11 @@ require (
github.com/sirupsen/logrus v1.9.4-0.20241118143825-d1e633264448
github.com/spf13/viper v1.19.0
github.com/urfave/cli/v2 v2.27.5
golang.org/x/net v0.32.0
golang.org/x/net v0.33.0
golang.org/x/oauth2 v0.24.0
golang.org/x/sys v0.28.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/mount-utils v0.31.4
k8s.io/mount-utils v0.32.0
)

require (
Expand Down Expand Up @@ -75,7 +75,6 @@ require (
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/containerd/typeurl/v2 v2.2.2 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/denisbrodbeck/machineid v1.0.1 // indirect
Expand Down Expand Up @@ -103,7 +102,6 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand Down Expand Up @@ -153,8 +151,6 @@ require (
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/runc v1.1.14 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/otiai10/copy v1.14.0 // indirect
github.com/packethost/packngo v0.29.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
Expand Down Expand Up @@ -212,7 +208,7 @@ require (
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.30.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
golang.org/x/image v0.20.0 // indirect
golang.org/x/mod v0.22.0 // indirect
Expand All @@ -230,7 +226,7 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
howett.net/plist v1.0.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
pault.ag/go/modprobe v0.1.2 // indirect
pault.ag/go/topsort v0.1.1 // indirect
)
Loading

0 comments on commit 0774d9b

Please sign in to comment.