summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-05-19 05:43:40 -0400
committerGitHub <noreply@github.com>2021-05-19 05:43:40 -0400
commitc84fdedda827d5d34e0d53622ed39b56c386df09 (patch)
tree3e53b0a354b05acdd51c7c25119004ec1f65cb67
parent959d6a0c40b60a84eead551eaaa7498450017763 (diff)
parentaf748b94ed254249fd61c17a06ed3ece4e3947de (diff)
downloadpodman-c84fdedda827d5d34e0d53622ed39b56c386df09.tar.gz
podman-c84fdedda827d5d34e0d53622ed39b56c386df09.tar.bz2
podman-c84fdedda827d5d34e0d53622ed39b56c386df09.zip
Merge pull request #10398 from containers/dependabot/go_modules/k8s.io/apimachinery-0.21.1
Bump k8s.io/apimachinery from 0.21.0 to 0.21.1
-rw-r--r--go.mod2
-rw-r--r--go.sum3
-rw-r--r--vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go2
-rw-r--r--vendor/modules.txt2
4 files changed, 5 insertions, 4 deletions
diff --git a/go.mod b/go.mod
index 04e44d5b3..044428eb0 100644
--- a/go.mod
+++ b/go.mod
@@ -67,5 +67,5 @@ require (
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
k8s.io/api v0.21.0
- k8s.io/apimachinery v0.21.0
+ k8s.io/apimachinery v0.21.1
)
diff --git a/go.sum b/go.sum
index ba7becac8..add050219 100644
--- a/go.sum
+++ b/go.sum
@@ -1222,8 +1222,9 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
k8s.io/api v0.21.0 h1:gu5iGF4V6tfVCQ/R+8Hc0h7H1JuEhzyEi9S4R5LM8+Y=
k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU=
k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
-k8s.io/apimachinery v0.21.0 h1:3Fx+41if+IRavNcKOz09FwEXDBG6ORh6iMsTSelhkMA=
k8s.io/apimachinery v0.21.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
+k8s.io/apimachinery v0.21.1 h1:Q6XuHGlj2xc+hlMCvqyYfbv3H7SRGn2c8NycxJquDVs=
+k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y=
k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk=
diff --git a/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go b/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go
index f89ca163c..3e0cdb10d 100644
--- a/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go
+++ b/vendor/k8s.io/apimachinery/pkg/api/resource/quantity_proto.go
@@ -166,7 +166,7 @@ func (m *Quantity) Unmarshal(data []byte) error {
if err != nil {
return err
}
- if skippy < 0 {
+ if (skippy < 0) || (iNdEx+skippy) < 0 {
return ErrInvalidLengthGenerated
}
if (iNdEx + skippy) > l {
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 2aa2e39fb..b3c90dd5b 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -782,7 +782,7 @@ gopkg.in/yaml.v3
# k8s.io/api v0.21.0
k8s.io/api/apps/v1
k8s.io/api/core/v1
-# k8s.io/apimachinery v0.21.0
+# k8s.io/apimachinery v0.21.1
k8s.io/apimachinery/pkg/api/resource
k8s.io/apimachinery/pkg/apis/meta/v1
k8s.io/apimachinery/pkg/conversion