diff --git a/go.mod b/go.mod index 69f538e7b..673d127f8 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( sigs.k8s.io/controller-runtime v0.12.3 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220104140252-e52a8b1fba62 sigs.k8s.io/controller-tools v0.9.2 - sigs.k8s.io/kustomize/kustomize/v4 v4.5.6 + sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 ) // module was renamed? @@ -240,9 +240,9 @@ require ( sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/kubebuilder/v3 v3.3.0 // indirect - sigs.k8s.io/kustomize/api v0.12.0 // indirect - sigs.k8s.io/kustomize/cmd/config v0.10.8 // indirect - sigs.k8s.io/kustomize/kyaml v0.13.8 // indirect + sigs.k8s.io/kustomize/api v0.12.1 // indirect + sigs.k8s.io/kustomize/cmd/config v0.10.9 // indirect + sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index 1aff24754..d4cc5d0d1 100644 --- a/go.sum +++ b/go.sum @@ -1986,18 +1986,18 @@ sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20220613215411-7a05e3d4fe6d/go.mod h sigs.k8s.io/kubebuilder/v3 v3.3.0 h1:rl1d7qHajPDS83bM9IhR85jtEBTRZzQziWwAGYTsadE= sigs.k8s.io/kubebuilder/v3 v3.3.0/go.mod h1:573SPrO9ttCNPvXVuGQRCpjsEsFza/S+8Jo/b+a+wR0= sigs.k8s.io/kustomize/api v0.11.4/go.mod h1:k+8RsqYbgpkIrJ4p9jcdPqe8DprLxFUUO0yNOq8C+xI= -sigs.k8s.io/kustomize/api v0.12.0 h1:9kDUe94bgFaTJwPaHC3mdlcw/PfWupSKov1iGcKSlSw= -sigs.k8s.io/kustomize/api v0.12.0/go.mod h1:x/VlfVNU8ey7rqGuWFKJH2mx4zmAgcjNLSLIwqLZKmQ= +sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM= +sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s= sigs.k8s.io/kustomize/cmd/config v0.10.6/go.mod h1:/S4A4nUANUa4bZJ/Edt7ZQTyKOY9WCER0uBS1SW2Rco= -sigs.k8s.io/kustomize/cmd/config v0.10.8 h1:KDmanTWK4lwwjNDejg3z89AuMxBcVnuM/g0bJBwfR0k= -sigs.k8s.io/kustomize/cmd/config v0.10.8/go.mod h1:82d57N0Rf3ZfybJPDXvx27odKn0igO0wfSUaTKRWpBU= +sigs.k8s.io/kustomize/cmd/config v0.10.9 h1:LV8AUwZPuvqhGfia50uNwsPwNg1xOy9koEf5hyBnYs4= +sigs.k8s.io/kustomize/cmd/config v0.10.9/go.mod h1:T0s850zPV3wKfBALA0dyeP/K74jlJcoP8Pr9ZWwE3MQ= sigs.k8s.io/kustomize/kustomize/v4 v4.5.4/go.mod h1:Zo/Xc5FKD6sHl0lilbrieeGeZHVYCA4BzxeAaLI05Bg= -sigs.k8s.io/kustomize/kustomize/v4 v4.5.6 h1:mvjuWuJrS+sZA9PQJcA/dZm9UxLk7iCzKS1TRJZdew8= -sigs.k8s.io/kustomize/kustomize/v4 v4.5.6/go.mod h1:RkXpauAhhE6H9FosggVhtNvJdiTlefRaewhOo7q5XV0= +sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 h1:cDW6AVMl6t/SLuQaezMET8hgnadZGIAr8tUrxFVOrpg= +sigs.k8s.io/kustomize/kustomize/v4 v4.5.7/go.mod h1:VSNKEH9D9d9bLiWEGbS6Xbg/Ih0tgQalmPvntzRxZ/Q= sigs.k8s.io/kustomize/kyaml v0.10.21/go.mod h1:TYWhGwW9vjoRh3rWqBwB/ZOXyEGRVWe7Ggc3+KZIO+c= sigs.k8s.io/kustomize/kyaml v0.13.6/go.mod h1:yHP031rn1QX1lr/Xd934Ri/xdVNG8BE2ECa78Ht/kEg= -sigs.k8s.io/kustomize/kyaml v0.13.8 h1:L4dSaDb6dL5mzv0UWSrUw8bskcEW+EnNtIObT5BoRsU= -sigs.k8s.io/kustomize/kyaml v0.13.8/go.mod h1:QsRbD0/KcU+wdk0/L0fIp2KLnohkVzs6fQ85/nOXac4= +sigs.k8s.io/kustomize/kyaml v0.13.9 h1:Qz53EAaFFANyNgyOEJbT/yoIHygK40/ZcvU3rgry2Tk= +sigs.k8s.io/kustomize/kyaml v0.13.9/go.mod h1:QsRbD0/KcU+wdk0/L0fIp2KLnohkVzs6fQ85/nOXac4= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= diff --git a/vendor/modules.txt b/vendor/modules.txt index 1526ae8ce..01d7324f3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1797,7 +1797,7 @@ sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/api sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/controllers sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/hack -# sigs.k8s.io/kustomize/api v0.12.0 +# sigs.k8s.io/kustomize/api v0.12.1 ## explicit; go 1.18 sigs.k8s.io/kustomize/api/filters/annotations sigs.k8s.io/kustomize/api/filters/fieldspec @@ -1843,7 +1843,7 @@ sigs.k8s.io/kustomize/api/provider sigs.k8s.io/kustomize/api/resmap sigs.k8s.io/kustomize/api/resource sigs.k8s.io/kustomize/api/types -# sigs.k8s.io/kustomize/cmd/config v0.10.8 +# sigs.k8s.io/kustomize/cmd/config v0.10.9 ## explicit; go 1.18 sigs.k8s.io/kustomize/cmd/config/completion sigs.k8s.io/kustomize/cmd/config/configcobra @@ -1854,7 +1854,7 @@ sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/api sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/tutorials sigs.k8s.io/kustomize/cmd/config/runner -# sigs.k8s.io/kustomize/kustomize/v4 v4.5.6 +# sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 ## explicit; go 1.18 sigs.k8s.io/kustomize/kustomize/v4 sigs.k8s.io/kustomize/kustomize/v4/commands @@ -1872,7 +1872,7 @@ sigs.k8s.io/kustomize/kustomize/v4/commands/openapi sigs.k8s.io/kustomize/kustomize/v4/commands/openapi/fetch sigs.k8s.io/kustomize/kustomize/v4/commands/openapi/info sigs.k8s.io/kustomize/kustomize/v4/commands/version -# sigs.k8s.io/kustomize/kyaml v0.13.8 +# sigs.k8s.io/kustomize/kyaml v0.13.9 ## explicit; go 1.18 sigs.k8s.io/kustomize/kyaml/comments sigs.k8s.io/kustomize/kyaml/errors diff --git a/vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_test_unix.go b/vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_unix.go similarity index 63% rename from vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_test_unix.go rename to vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_unix.go index 6331e4546..15935a462 100644 --- a/vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_test_unix.go +++ b/vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_unix.go @@ -8,10 +8,8 @@ package filesys import ( "path/filepath" - "testing" ) -func getOSRoot(t *testing.T) string { - t.Helper() - return string(filepath.Separator) +func getOSRoot() (string, error) { + return string(filepath.Separator), nil } diff --git a/vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_test_windows.go b/vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_windows.go similarity index 54% rename from vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_test_windows.go rename to vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_windows.go index d739664f3..8c8a33c4d 100644 --- a/vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_test_windows.go +++ b/vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_windows.go @@ -5,16 +5,14 @@ package filesys import ( "path/filepath" - "testing" - "github.com/stretchr/testify/require" "golang.org/x/sys/windows" ) -func getOSRoot(t *testing.T) string { - t.Helper() - +func getOSRoot() (string, error) { sysDir, err := windows.GetSystemDirectory() - require.NoError(t, err) - return filepath.VolumeName(sysDir) + `\` + if err != nil { + return "", err + } + return filepath.VolumeName(sysDir) + `\`, nil }