diff --git a/go.mod b/go.mod index 011e1621..2fc28996 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/google/gofuzz v1.1.0 github.com/google/uuid v1.1.2 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 - github.com/imdario/mergo v0.3.5 + github.com/imdario/mergo v0.3.6 github.com/peterbourgon/diskv v2.0.1+incompatible github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 @@ -24,7 +24,7 @@ require ( golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 google.golang.org/protobuf v1.28.0 - k8s.io/api v0.0.0-20220802201338-d351ecda57ef + k8s.io/api v0.0.0-20220803001323-7488a8ce4dc3 k8s.io/apimachinery v0.0.0-20220802201132-b5410464b8fe k8s.io/klog/v2 v2.70.1 k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 @@ -61,6 +61,6 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220802201338-d351ecda57ef + k8s.io/api => k8s.io/api v0.0.0-20220803001323-7488a8ce4dc3 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220802201132-b5410464b8fe ) diff --git a/go.sum b/go.sum index b86c4186..ea450c48 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:Fecb github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= -github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -477,8 +477,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20220802201338-d351ecda57ef h1:lT5VdAxwTFxg56ENZm0v2sovXzWbc5DjQD+sWV5tV10= -k8s.io/api v0.0.0-20220802201338-d351ecda57ef/go.mod h1:zM75l97GRtsYnJd33QhbbeOEqEScEouIzD3Yff6qSao= +k8s.io/api v0.0.0-20220803001323-7488a8ce4dc3 h1:sut2KNwiqpS3kcHQbQYusZ+7P108TWRPgzIAgUacpD0= +k8s.io/api v0.0.0-20220803001323-7488a8ce4dc3/go.mod h1:zM75l97GRtsYnJd33QhbbeOEqEScEouIzD3Yff6qSao= k8s.io/apimachinery v0.0.0-20220802201132-b5410464b8fe h1:X6c3L2p8kerCDZqpcDMIKMEJgb2qDHRP4cc1uZYcWm0= k8s.io/apimachinery v0.0.0-20220802201132-b5410464b8fe/go.mod h1:lE2kjTmALiRf8OG82W24K4QHQUlQX8ucdy7xRtD3zbE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=