summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-01 06:41:21 -0400
committerGitHub <noreply@github.com>2020-07-01 06:41:21 -0400
commitd8718fd62e87d0a364a4092c6333d90e26ce9c8e (patch)
tree929284c094d64e4b0f71af5c8b62ed7f1ba0f723
parent11e98d4db2a5d8a093ec9e8a0ba439943c9c169d (diff)
parent923e9befa6037ffb49dfc6e155304886d8edb77f (diff)
downloadpodman-d8718fd62e87d0a364a4092c6333d90e26ce9c8e.tar.gz
podman-d8718fd62e87d0a364a4092c6333d90e26ce9c8e.tar.bz2
podman-d8718fd62e87d0a364a4092c6333d90e26ce9c8e.zip
Merge pull request #6819 from containers/dependabot/go_modules/k8s.io/apimachinery-0.18.5
Bump k8s.io/apimachinery from 0.18.4 to 0.18.5
-rw-r--r--go.mod2
-rw-r--r--go.sum2
-rw-r--r--vendor/modules.txt2
3 files changed, 4 insertions, 2 deletions
diff --git a/go.mod b/go.mod
index 64981efc1..8a27ac1e3 100644
--- a/go.mod
+++ b/go.mod
@@ -64,6 +64,6 @@ require (
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.18.4
- k8s.io/apimachinery v0.18.4
+ k8s.io/apimachinery v0.18.5
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
)
diff --git a/go.sum b/go.sum
index e069825da..e1d01b20e 100644
--- a/go.sum
+++ b/go.sum
@@ -631,6 +631,8 @@ k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4=
k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA=
k8s.io/apimachinery v0.18.4 h1:ST2beySjhqwJoIFk6p7Hp5v5O0hYY6Gngq/gUYXTPIA=
k8s.io/apimachinery v0.18.4/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
+k8s.io/apimachinery v0.18.5 h1:Lh6tgsM9FMkC12K5T5QjRm7rDs6aQN5JHkA0JomULDM=
+k8s.io/apimachinery v0.18.5/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab h1:E8Fecph0qbNsAbijJJQryKu4Oi9QTp5cVpjTE+nqg6g=
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 497381b52..fdc196274 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -692,7 +692,7 @@ gopkg.in/yaml.v3
# k8s.io/api v0.18.4
k8s.io/api/apps/v1
k8s.io/api/core/v1
-# k8s.io/apimachinery v0.18.4
+# k8s.io/apimachinery v0.18.5
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/api/resource
k8s.io/apimachinery/pkg/apis/meta/v1