Merge pull request #5525 from jbartosik/patch-0-13

Cherry pick #5482 and #5484 to VPA release 0.13 branch
kubernetes · Feb 22, 2023 · 678b6de · 678b6de
2 parents be5b396 + 80dfbf9
commit 678b6de
Show file tree

Hide file tree

Showing 14 changed files with 82 additions and 15 deletions.
diff --git a/vertical-pod-autoscaler/builder/Dockerfile b/vertical-pod-autoscaler/builder/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.19
+FROM golang:1.19.5
 LABEL maintainer="Beata Skiba	<[email protected]>"
 
 ENV GOPATH /gopath/

diff --git a/vertical-pod-autoscaler/go.mod b/vertical-pod-autoscaler/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect

diff --git a/vertical-pod-autoscaler/go.sum b/vertical-pod-autoscaler/go.sum
@@ -63,8 +63,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw=
-github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
+github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=

diff --git a/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/CHANGES.md b/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/CHANGES.md
diff --git a/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/README.md b/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/README.md
diff --git a/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/constants.go b/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/constants.go
diff --git a/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/filter_adapter.go b/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/filter_adapter.go
diff --git a/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/parameter.go b/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/parameter.go
diff --git a/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/request.go b/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/request.go
diff --git a/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/response.go b/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/response.go
diff --git a/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/route.go b/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/route.go
diff --git a/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/route_builder.go b/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/route_builder.go
diff --git a/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/web_service.go b/vertical-pod-autoscaler/vendor/github.com/emicklei/go-restful/v3/web_service.go
diff --git a/vertical-pod-autoscaler/vendor/modules.txt b/vertical-pod-autoscaler/vendor/modules.txt
@@ -16,7 +16,7 @@ github.com/cespare/xxhash/v2
 # github.com/davecgh/go-spew v1.1.1
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/emicklei/go-restful/v3 v3.8.0
+# github.com/emicklei/go-restful/v3 v3.10.1
 ## explicit; go 1.13
 github.com/emicklei/go-restful/v3
 github.com/emicklei/go-restful/v3/log