From 16f4fb3dbb5782edd99187c2affcea86dae12032 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 4 Jun 2021 09:54:39 -0700 Subject: [PATCH] Merge pull request #102588 from saschagrunert/release-1.19 Revert "Cleanup portforward streams after their usage" [1.19] Kubernetes-commit: f1bbe359f4ee98a54412ff1f80f9ae3537a5e28c --- Godeps/Godeps.json | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index be765f4fb..082b010c1 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -448,7 +448,7 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "509bd5702102" + "Rev": "7556458a5d8e" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 4d229125e..f801f2420 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 golang.org/x/time v0.0.0-20191024005414-555d28b269f0 k8s.io/api v0.0.0-20210329192645-60680b5087d3 - k8s.io/apimachinery v0.0.0-20210518100905-509bd5702102 + k8s.io/apimachinery v0.0.0-20210604165439-7556458a5d8e k8s.io/klog/v2 v2.2.0 k8s.io/utils v0.0.0-20200729134348-d5654de09c73 sigs.k8s.io/yaml v1.2.0 @@ -35,5 +35,5 @@ require ( replace ( k8s.io/api => k8s.io/api v0.0.0-20210329192645-60680b5087d3 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100905-509bd5702102 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210604165439-7556458a5d8e ) diff --git a/go.sum b/go.sum index db6e1e2f1..a07615d79 100644 --- a/go.sum +++ b/go.sum @@ -336,8 +336,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= k8s.io/api v0.0.0-20210329192645-60680b5087d3 h1:JDIVP6BKnNcrE4Y2r7oFkscaa55eA3lGqvkZ5ILU/hU= k8s.io/api v0.0.0-20210329192645-60680b5087d3/go.mod h1:caTs/4rCE73izFZceHw5Pv4eK7+8BmGwNb20G7qIqAY= -k8s.io/apimachinery v0.0.0-20210518100905-509bd5702102 h1:J40LOI+/ouqMVq8BWszhBPJuNFPaPQwfn7xXd3XytQk= -k8s.io/apimachinery v0.0.0-20210518100905-509bd5702102/go.mod h1:9eb44nUQSsz9QZiilFRuMj3ZbTmoWolU8S2gnXoRMjo= +k8s.io/apimachinery v0.0.0-20210604165439-7556458a5d8e h1:pyuYALMVXQT6KuHrjG74R/HJXxJxObZAEonHhrDUpiw= +k8s.io/apimachinery v0.0.0-20210604165439-7556458a5d8e/go.mod h1:9eb44nUQSsz9QZiilFRuMj3ZbTmoWolU8S2gnXoRMjo= 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= k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=