From 4f212856eab86538a75dd929b4a9afa5c142b915 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 4 Mar 2021 22:30:21 -0800 Subject: [PATCH] Merge pull request #98127 from mortent/AddConditionsToPDBs Add conditions to PDB status Kubernetes-commit: 7a4914014521369be9e5162b869476fdfc7ea2f9 --- Godeps/Godeps.json | 2 +- go.mod | 4 ++-- go.sum | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index d5ebd91a..65ab612f 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -472,7 +472,7 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "1f71974292e6" + "Rev": "85a11c396cac" }, { "ImportPath": "k8s.io/apimachinery", diff --git a/go.mod b/go.mod index 1266591b..220d825a 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba - k8s.io/api v0.0.0-20210304212041-1f71974292e6 + k8s.io/api v0.0.0-20210305063021-85a11c396cac k8s.io/apimachinery v0.0.0-20210304154449-569bd20062c9 k8s.io/klog/v2 v2.5.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 @@ -35,6 +35,6 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210304212041-1f71974292e6 + k8s.io/api => k8s.io/api v0.0.0-20210305063021-85a11c396cac k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210304154449-569bd20062c9 ) diff --git a/go.sum b/go.sum index 4e0f0faa..8a6413f9 100644 --- a/go.sum +++ b/go.sum @@ -427,7 +427,7 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= -k8s.io/api v0.0.0-20210304212041-1f71974292e6/go.mod h1:HGMdyFJB+72iMWQoS/EwpAtVFz79M8RyBuDE09jjiUM= +k8s.io/api v0.0.0-20210305063021-85a11c396cac/go.mod h1:HGMdyFJB+72iMWQoS/EwpAtVFz79M8RyBuDE09jjiUM= k8s.io/apimachinery v0.0.0-20210304154449-569bd20062c9/go.mod h1:+s3G/nGQJY9oe1CFOXRrb9QkXTIEgTnFtF8GeKZIgOg= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=