From 456cdf991bd9ec03584314e4c65682b7f03f0b22 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 16 Nov 2022 01:20:50 -0800 Subject: [PATCH] Merge pull request #113459 from aimuz/automated-cherry-pick-of-#112693-upstream-release-1.24 Automated cherry pick of #112693: Fixed (CVE-2022-27664) Bump golang.org/x/net to Kubernetes-commit: d818028a1851891cdf934a543bb7ff959ec23d50 --- go.mod | 25 ++++++++++++------------- go.sum | 9 +++++++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index b92ff82..24fb778 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager go 1.18 require ( - k8s.io/apimachinery v0.0.0 - k8s.io/cloud-provider v0.0.0 - k8s.io/controller-manager v0.0.0 + k8s.io/apimachinery v0.0.0-20221116094540-dba1916fc567 + k8s.io/cloud-provider v0.0.0-20221116102024-22738c7aa60c + k8s.io/controller-manager v0.0.0-20221116101909-9284d2c0ae0f ) require ( @@ -22,7 +22,7 @@ require ( golang.org/x/text v0.4.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/component-base v0.0.0 // indirect + k8s.io/component-base v0.0.0-20221116095701-b5d87a698ca2 // indirect k8s.io/klog/v2 v2.60.1 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect @@ -30,13 +30,12 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/apiserver => ../apiserver - k8s.io/client-go => ../client-go - k8s.io/cloud-provider => ../cloud-provider - k8s.io/component-base => ../component-base - k8s.io/component-helpers => ../component-helpers - k8s.io/controller-manager => ../controller-manager - k8s.io/kube-controller-manager => ../kube-controller-manager + k8s.io/api => k8s.io/api v0.0.0-20221116094747-a5cb4fed59cf + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221116094540-dba1916fc567 + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20221116100210-35b303bf1a07 + k8s.io/client-go => k8s.io/client-go v0.0.0-20221116095051-d8a162e21a65 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20221116102024-22738c7aa60c + k8s.io/component-base => k8s.io/component-base v0.0.0-20221116095701-b5d87a698ca2 + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20221116095805-e0509605fce5 + k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20221116101909-9284d2c0ae0f ) diff --git a/go.sum b/go.sum index 2e816a4..3af9577 100644 --- a/go.sum +++ b/go.sum @@ -71,6 +71,15 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +k8s.io/api v0.0.0-20221116094747-a5cb4fed59cf h1:H2XPmMgE55g2pvNUAVc23znDn31nSpa1Sf7pidcQVW0= +k8s.io/apimachinery v0.0.0-20221116094540-dba1916fc567 h1:boTtD9FkuvTHtLHIjuNF5XV97KZeFCYVAqslTo0sIvs= +k8s.io/apimachinery v0.0.0-20221116094540-dba1916fc567/go.mod h1:KuMOnNdYY8ZWrGp8F63IlL7Z1XrmrxcIeYEl3Csh8W4= +k8s.io/cloud-provider v0.0.0-20221116102024-22738c7aa60c h1:zuBDsNW8aeoGOLidaqirgvhRji6x3gIje0OvO/epzZQ= +k8s.io/cloud-provider v0.0.0-20221116102024-22738c7aa60c/go.mod h1:8jZpJDf73KbCfUBW9MkFbEenKFNxGs+8z66KgS44NOM= +k8s.io/component-base v0.0.0-20221116095701-b5d87a698ca2 h1:ZxFmpuev6VHX6xCDs4vdbDqpCsLRiuoBcv1U+UklYIs= +k8s.io/component-base v0.0.0-20221116095701-b5d87a698ca2/go.mod h1:TdHuBnj3LipmD0LiJtdlkHyD4qoBjHW0JmxyQDYpkxk= +k8s.io/controller-manager v0.0.0-20221116101909-9284d2c0ae0f h1:gkLzO5cis3e4Br4Co+NncZdY8QpzPxMqnumWOIEjHvQ= +k8s.io/controller-manager v0.0.0-20221116101909-9284d2c0ae0f/go.mod h1:b+unLXBKHC/iyouj99Hnwi+RSl+SVk26QtbZm0voKV8= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=