From 2cbef4204dd9cc1006bff0cde2da06a954f371e8 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 25 Mar 2022 19:18:10 -0700 Subject: [PATCH] Merge pull request #109040 from jpbetz/revert-cel-bump Revert #108954: Use CEL EagerlyValidateDeclarations to improve compilation performance Kubernetes-commit: f411c4068c89c540654a774178d55d74c927e2f9 --- go.mod | 23 +++++++++++------------ go.sum | 14 +++++++++++++- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index d2c1326..28afee1 100644 --- a/go.mod +++ b/go.mod @@ -5,19 +5,18 @@ module k8s.io/kube-controller-manager go 1.16 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-20220326050748-1a826352d1a6 + k8s.io/cloud-provider v0.0.0-20220326053810-ca873b23a667 + k8s.io/controller-manager v0.0.0-20220326053649-b59612817121 ) 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-20220324210930-df53a95c65aa + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220326050748-1a826352d1a6 + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220326051859-a257d00b02c3 + k8s.io/client-go => k8s.io/client-go v0.0.0-20220326011238-23ab4aec8e31 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20220326053810-ca873b23a667 + k8s.io/component-base => k8s.io/component-base v0.0.0-20220326051422-b680b3f2362c + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220324211837-3d0aa6c934c2 + k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20220326053649-b59612817121 ) diff --git a/go.sum b/go.sum index b6c2958..aeaf07d 100644 --- a/go.sum +++ b/go.sum @@ -63,7 +63,6 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -857,6 +856,19 @@ 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= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.0.0-20220324210930-df53a95c65aa h1:NzCktMsy22Y/ddoBN/kf96kFaklITIHNfA1sRv6UofA= +k8s.io/api v0.0.0-20220324210930-df53a95c65aa/go.mod h1:Ea6ReZGsqdWOZc66t7sHO58lTcUGyQcMJ3UfsqOnKfM= +k8s.io/apimachinery v0.0.0-20220326050748-1a826352d1a6 h1:6HO0jOM6IZFgU8JjScwE6mpiM6GADuTmpHOsFXYlGXc= +k8s.io/apimachinery v0.0.0-20220326050748-1a826352d1a6/go.mod h1:V4ECjDypP1xQpnL3N9yFzlbGZgd8tLKouJnRyAn/Zyw= +k8s.io/apiserver v0.0.0-20220326051859-a257d00b02c3/go.mod h1:1Uud4N7UAp5d9pLZchzr0F7hCIfaKSHQaiWSnV+uinE= +k8s.io/client-go v0.0.0-20220326011238-23ab4aec8e31/go.mod h1:Ybgn93C4EQdX8j0DOUUxpqR2Y1meaOQLr7Uj4rz/4CU= +k8s.io/cloud-provider v0.0.0-20220326053810-ca873b23a667 h1:F/PeeLj9cYLkQq9rtlJ2kG0R/2HW2o9e2e6Pfb0HNh0= +k8s.io/cloud-provider v0.0.0-20220326053810-ca873b23a667/go.mod h1:l1XonPbybiLmKDirpqDyXOjkeEj5lafA2TAUtTJy5+A= +k8s.io/component-base v0.0.0-20220326051422-b680b3f2362c h1:AmH3eIaVUK6hBg+Flf2USKyp6fnsuhIMEhA/Xx5GQwo= +k8s.io/component-base v0.0.0-20220326051422-b680b3f2362c/go.mod h1:woA9HhtUZnmlsjJjnGRS0M27RhWVedDuMan33JaKeWE= +k8s.io/component-helpers v0.0.0-20220324211837-3d0aa6c934c2/go.mod h1:XNNyuV8JN0NpWr6Dty1J05pgfwNR+zKT65DX8BBkt2I= +k8s.io/controller-manager v0.0.0-20220326053649-b59612817121 h1:JWGGuWH7gOIejYe6KZme9UB6+MxAnXBQEdygjm044G0= +k8s.io/controller-manager v0.0.0-20220326053649-b59612817121/go.mod h1:YgvmF9e+IVr79EJiOc7WL1AM+ILhS3jLD+oz4LbYMB8= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=