From 97dc124e178839a7864afc651780b8d908200b09 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Thu, 15 Sep 2022 15:55:00 -0400 Subject: [PATCH] Setting the Kubernetes libs at 0.24.5 0.24.5 is the latest on patch version for the 1.24 client libraries. Rancher supported Kubernetes 1.24 as the latest version and those libraries are using inside of Rancher itself. Setting to 1.24 libraries so that the chain of dependencies does not force Rancher to use the 1.25 libraries. Note, before this fleet was using 0.24.3, 0.25.0, and 1.24.4. It was inconsistent. Dependabot to update Kubernetes packages can lead to inconsistent versions. It's often useful to update them all together as part a manual change. Signed-off-by: Matt Farina --- go.mod | 62 +++++++++++++++++++++---------------------- go.sum | 70 ++++++++++++++++++++++++------------------------- pkg/apis/go.mod | 5 ++-- pkg/apis/go.sum | 19 +++++++------- 4 files changed, 77 insertions(+), 79 deletions(-) diff --git a/go.mod b/go.mod index 9bb9da928f..f673004833 100644 --- a/go.mod +++ b/go.mod @@ -5,31 +5,31 @@ go 1.18 replace ( github.com/rancher/fleet/pkg/apis => ./pkg/apis helm.sh/helm/v3 => github.com/rancher/helm/v3 v3.9.0-rancher1 - k8s.io/api => k8s.io/api v0.24.3 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.3 - k8s.io/apimachinery => k8s.io/apimachinery v0.24.3 // indirect - k8s.io/apiserver => k8s.io/apiserver v0.24.3 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.3 + k8s.io/api => k8s.io/api v0.24.5 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.5 + k8s.io/apimachinery => k8s.io/apimachinery v0.24.5 // indirect + k8s.io/apiserver => k8s.io/apiserver v0.24.5 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.5 k8s.io/client-go => github.com/rancher/client-go v0.24.0-fleet1 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.3 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.3 - k8s.io/code-generator => k8s.io/code-generator v0.24.3 - k8s.io/component-base => k8s.io/component-base v0.24.3 - k8s.io/component-helpers => k8s.io/component-helpers v0.24.3 - k8s.io/controller-manager => k8s.io/controller-manager v0.24.3 - k8s.io/cri-api => k8s.io/cri-api v0.24.3 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.3 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.3 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.3 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.3 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.3 - k8s.io/kubectl => k8s.io/kubectl v0.24.3 - k8s.io/kubelet => k8s.io/kubelet v0.24.3 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.3 - k8s.io/metrics => k8s.io/metrics v0.24.3 - k8s.io/mount-utils => k8s.io/mount-utils v0.24.3 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.3 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.3 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.5 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.5 + k8s.io/code-generator => k8s.io/code-generator v0.24.5 + k8s.io/component-base => k8s.io/component-base v0.24.5 + k8s.io/component-helpers => k8s.io/component-helpers v0.24.5 + k8s.io/controller-manager => k8s.io/controller-manager v0.24.5 + k8s.io/cri-api => k8s.io/cri-api v0.24.5 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.5 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.5 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.5 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.5 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.5 + k8s.io/kubectl => k8s.io/kubectl v0.24.5 + k8s.io/kubelet => k8s.io/kubelet v0.24.5 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.5 + k8s.io/metrics => k8s.io/metrics v0.24.5 + k8s.io/mount-utils => k8s.io/mount-utils v0.24.5 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.5 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.5 ) require ( @@ -59,13 +59,13 @@ require ( gopkg.in/yaml.v2 v2.4.0 helm.sh/helm/v3 v3.9.0 k8s.io/api v0.25.0 - k8s.io/apiextensions-apiserver v0.24.3 + k8s.io/apiextensions-apiserver v0.24.5 k8s.io/apimachinery v0.25.0 - k8s.io/cli-runtime v0.24.3 + k8s.io/cli-runtime v0.24.5 k8s.io/client-go v12.0.0+incompatible k8s.io/klog/v2 v2.80.1 k8s.io/kube-openapi v0.0.0-20220621154418-c39d0f63fac8 - k8s.io/kubernetes v1.24.4 + k8s.io/kubernetes v1.24.5 sigs.k8s.io/cli-utils v0.33.0 sigs.k8s.io/kustomize/api v0.12.1 sigs.k8s.io/kustomize/kyaml v0.13.9 @@ -252,12 +252,12 @@ require ( gopkg.in/urfave/cli.v1 v1.20.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiserver v0.24.3 // indirect - k8s.io/code-generator v0.24.3 // indirect - k8s.io/component-base v0.24.3 // indirect + k8s.io/apiserver v0.24.5 // indirect + k8s.io/code-generator v0.24.5 // indirect + k8s.io/component-base v0.24.5 // indirect k8s.io/gengo v0.0.0-20220613173612-397b4ae3bce7 // indirect k8s.io/klog v1.0.0 // indirect - k8s.io/kubectl v0.24.3 // indirect + k8s.io/kubectl v0.24.5 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect oras.land/oras-go v1.2.0 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/go.sum b/go.sum index dc0dda1835..7084cc2407 100644 --- a/go.sum +++ b/go.sum @@ -555,7 +555,7 @@ github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/cadvisor v0.44.1/go.mod h1:GQ9KQfz0iNHQk3D6ftzJWK4TXabfIgM10Oy3FkR+Gzg= -github.com/google/cel-go v0.10.1/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= +github.com/google/cel-go v0.10.2/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= github.com/google/certificate-transparency-go v1.1.1/go.mod h1:FDKqPvSXawb2ecErVRrD+nfy23RCzyl7eqVCEmlT1Zs= @@ -2069,26 +2069,26 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt 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= honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= -k8s.io/api v0.24.3 h1:tt55QEmKd6L2k5DP6G/ZzdMQKvG5ro4H4teClqm0sTY= -k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI= -k8s.io/apiextensions-apiserver v0.24.3 h1:kyx+Tmro1qEsTUr07ZGQOfvTsF61yn+AxnxytBWq8As= -k8s.io/apiextensions-apiserver v0.24.3/go.mod h1:cL0xkmUefpYM4f6IuOau+6NMFEIh6/7wXe/O4vPVJ8A= -k8s.io/apimachinery v0.24.3 h1:hrFiNSA2cBZqllakVYyH/VyEh4B581bQRmqATJSeQTg= -k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= -k8s.io/apiserver v0.24.3 h1:J8CKjUaZopT0hSgxjzUyp3T1GK78iixxOuFpEC0MI3k= -k8s.io/apiserver v0.24.3/go.mod h1:aXfwtIn4U27B7lYs5f2BKgz6DRbgWy+HJeYReN1jLJ8= -k8s.io/cli-runtime v0.24.3 h1:O9YvUHrDSCQUPlsqVmaqDrueqjpJ7IO6Yas9B6xGSoo= -k8s.io/cli-runtime v0.24.3/go.mod h1:In84wauoMOqa7JDvDSXGbf8lTNlr70fOGpYlYfJtSqA= -k8s.io/cloud-provider v0.24.3/go.mod h1:CRIMwnR4e6FpGO5g81nofNuKGQcpJx8El2JEU+BsH9M= -k8s.io/cluster-bootstrap v0.24.3/go.mod h1:plud10KCFfNjsf2FNalENFGvJWVtcKa0KbKie5wQAvA= -k8s.io/code-generator v0.24.3 h1:itd1V1ZAYKM+WT+qQDlFKhU1D/Ff5HcEFL/icfClnZA= -k8s.io/code-generator v0.24.3/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= -k8s.io/component-base v0.24.3 h1:u99WjuHYCRJjS1xeLOx72DdRaghuDnuMgueiGMFy1ec= -k8s.io/component-base v0.24.3/go.mod h1:bqom2IWN9Lj+vwAkPNOv2TflsP1PeVDIwIN0lRthxYY= -k8s.io/component-helpers v0.24.3/go.mod h1:/1WNW8TfBOijQ1ED2uCHb4wtXYWDVNMqUll8h36iNVo= -k8s.io/controller-manager v0.24.3/go.mod h1:qU/ZC8qmKxiVlRwLUfqXAzgsBi3q44E8Xn8qHs/MiVY= -k8s.io/cri-api v0.24.3/go.mod h1:t3tImFtGeStN+ES69bQUX9sFg67ek38BM9YIJhMmuig= -k8s.io/csi-translation-lib v0.24.3/go.mod h1:PfajTaauPYSL4hWKDRBVbUfO611Uv+h3w1YA9Twmzjk= +k8s.io/api v0.24.5 h1:dujOrusqYFyeDIfDn4jVrLUGW4OUahkLBcaKjDLENrc= +k8s.io/api v0.24.5/go.mod h1:0qqWiH+FEHlS5MMv1NOodAcGzeOFgtsBOT7S8luxr7E= +k8s.io/apiextensions-apiserver v0.24.5 h1:gH+AfrxGW1zVUR0E08/bpErH8nZGLHJxjdyK8cFF4eQ= +k8s.io/apiextensions-apiserver v0.24.5/go.mod h1:e4KrDEeYCKy+h7YmdR2+uIPtbF99z8eQY+5ef8/6fz4= +k8s.io/apimachinery v0.24.5 h1:6pbRsdruZAjwcbffR2lTN6U+KsF30m2GLTbgAlPU9fg= +k8s.io/apimachinery v0.24.5/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apiserver v0.24.5 h1:HZ3sE1NrhCD0rRS1sb6FcZXycGQrI0WYutQWDh7N2uQ= +k8s.io/apiserver v0.24.5/go.mod h1:wNZ4hFJ2ZiMgNUWEdnWI7DRWy63lMoUIQBbOSoAmBhU= +k8s.io/cli-runtime v0.24.5 h1:X0ze0UVtCjoRpPIAchbch0qfyb7xlSTqRl7eQYfGoOk= +k8s.io/cli-runtime v0.24.5/go.mod h1:nkPDPWw4JRuQJ8LXQBgaXoj0l1/bdyGR1zZJPy8U9r8= +k8s.io/cloud-provider v0.24.5/go.mod h1:R5eKvXMLbudxTkpD66nsbZfONgf/Zh4LNiDBq94uu0s= +k8s.io/cluster-bootstrap v0.24.5/go.mod h1:CvRsLQE2IpBF+2srOcVcB/TokncArUulovU3g7B7l0k= +k8s.io/code-generator v0.24.5 h1:8f2peQ02WDBH1T4Xq2tL4Sf+SYm3qlENlduauzFpkF0= +k8s.io/code-generator v0.24.5/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= +k8s.io/component-base v0.24.5 h1:PoGX+D5FQiGYuZNktuL2iRkLoX4g2gEq8fQp/j5ru2g= +k8s.io/component-base v0.24.5/go.mod h1:ys3MybmrUao2SRdx2HcI3RELSnogOa3Rh4S8WQfqnoU= +k8s.io/component-helpers v0.24.5/go.mod h1:VzOZ3+1ZELnJPxiWBoePoYMZPlSqQSWY/5UNA0UG7rY= +k8s.io/controller-manager v0.24.5/go.mod h1:9OYH7ilv7NhEMHH9Z9ybb13hcgIhbn3qgIhKbho1Uws= +k8s.io/cri-api v0.24.5/go.mod h1:t3tImFtGeStN+ES69bQUX9sFg67ek38BM9YIJhMmuig= +k8s.io/csi-translation-lib v0.24.5/go.mod h1:Enu9Po68UX8k6wRY8SSGnVJEKHpNSwxdLAiFBIAf0sc= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -2102,24 +2102,24 @@ k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-aggregator v0.24.3/go.mod h1:oMjdwraZtb0CtIxrzrAt/4GJxbivAM8AesZhYVmXZ54= -k8s.io/kube-controller-manager v0.24.3/go.mod h1:c7YN1XesvesxKM5uO5JqmcecnUsitFos1sIyt0eOprE= +k8s.io/kube-aggregator v0.24.5/go.mod h1:FDQV1cGnP8dnLiGG3VSh+ln+lsOVow7UwEBlhW6UrE8= +k8s.io/kube-controller-manager v0.24.5/go.mod h1:TRrIsXWAwWHzUGfodd2Cv8LNvIzXoQWEkdIOk9KHcRY= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= k8s.io/kube-openapi v0.0.0-20220621154418-c39d0f63fac8 h1:30P0UV8MQgg4f1khIUT09xHmpI5B5Wg0Vg6JNkUqsQ0= k8s.io/kube-openapi v0.0.0-20220621154418-c39d0f63fac8/go.mod h1:PNbiP2hKArDh8cgJZTDL6Ss/z3wsbga8yjj/7VMB+I4= -k8s.io/kube-proxy v0.24.3/go.mod h1:zJ+koqfBkRUAzUfXlBtFfyfH3InqM38t5ELGlTlPwO0= -k8s.io/kube-scheduler v0.24.3/go.mod h1:myFLGrPy8rcwPz6qg9L3rMRDT2eNIpizq+MXOzMjX/8= -k8s.io/kubectl v0.24.3 h1:PqY8ho/S/KuE2/hCC3Iee7X+lOtARYo0LQsNzvV/edE= -k8s.io/kubectl v0.24.3/go.mod h1:PYLcvw96sC1NLbxZEDbdlOEd6/C76VIWjGmWV5QjSk0= -k8s.io/kubelet v0.24.3/go.mod h1:vIdQ8bybBvLeMysTyj37QZNKNnCGVfWqpbsLaMT7wTE= -k8s.io/kubernetes v1.24.4 h1:/UDpUPBqNN5oL46ACw0Vzjt6LXOEQ7BAbsf5+kz+XbA= -k8s.io/kubernetes v1.24.4/go.mod h1:8e8maMiZzBR2/8Po5Uulx+MXZUYJuN3vtKwD4Ct1Xi0= -k8s.io/legacy-cloud-providers v0.24.3/go.mod h1:G548jzl58czqsrebwY1XXFKEkCEcJhX8tnPUCFv/uMo= -k8s.io/metrics v0.24.3/go.mod h1:p1M0lhMySWfhISkSd3HEj8xIgrVnJTK3PPhFq2rA3To= -k8s.io/mount-utils v0.24.3/go.mod h1:XrSqB3a2e8sq+aU+rlbcBtQ3EgcuDk5RP9ZsGxjoDrI= -k8s.io/pod-security-admission v0.24.3/go.mod h1:l862a6t98GO7IIIGIe/lh01TTq9fWu6ylTb7CLDrXkY= -k8s.io/sample-apiserver v0.24.3/go.mod h1:ZDr71tBj39HgTEFPugVn5v32aZ5z7XCu2kLWoygiBp0= +k8s.io/kube-proxy v0.24.5/go.mod h1:MX8Fl1ziPmePa3L/XMvXySSR59p644hrZVqeCh681ak= +k8s.io/kube-scheduler v0.24.5/go.mod h1:7tmxFmPJhL50nN2yG2D6aD7jn/g4OKPQVOjXLFQuTPg= +k8s.io/kubectl v0.24.5 h1:IZfbOR0peUjOcFOS32/okxkP9CRyaGROTrpvJSwrvxs= +k8s.io/kubectl v0.24.5/go.mod h1:WlayggDRJNQnrzyeL2/qD0yeke9ru8LdiR/mzaD9WF0= +k8s.io/kubelet v0.24.5/go.mod h1:zyWGNkQL1pLHilCwIwYfq70LkNnpkiIBn/oySO0evck= +k8s.io/kubernetes v1.24.5 h1:JW1tS4w6sWh34PNj9QKTbJ95xycxpYz+x0wx2Ay9LlQ= +k8s.io/kubernetes v1.24.5/go.mod h1:gdfYFbf9HlneLy8pnxgEnY7Idn6b4XXRGR3n3IHYe2Q= +k8s.io/legacy-cloud-providers v0.24.5/go.mod h1:JFVc1kMX6Zcpb6gAJbzVosj9d/DXsgGqGFdoMeferZs= +k8s.io/metrics v0.24.5/go.mod h1:Nt+rm7oTgDnBX7NcmAz7Enhp0s5CXfHIRdKSNiySCdQ= +k8s.io/mount-utils v0.24.5/go.mod h1:XrSqB3a2e8sq+aU+rlbcBtQ3EgcuDk5RP9ZsGxjoDrI= +k8s.io/pod-security-admission v0.24.5/go.mod h1:sLtw/YQX+RbSwT9FX3aNcFT+tmvq8Nn9In3Rlzz+YGs= +k8s.io/sample-apiserver v0.24.5/go.mod h1:FoeBu+79dmoCr8HOiEizsyP758PmTk9IfuvtRfPqPTg= k8s.io/system-validators v1.7.0/go.mod h1:gP1Ky+R9wtrSiFbrpEPwWMeYz9yqyy1S/KOh0Vci7WI= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/pkg/apis/go.mod b/pkg/apis/go.mod index 0f3fec077d..d9ad6b5178 100644 --- a/pkg/apis/go.mod +++ b/pkg/apis/go.mod @@ -4,12 +4,11 @@ go 1.18 require ( github.com/rancher/wrangler v1.0.0 - k8s.io/api v0.25.0 - k8s.io/apimachinery v0.25.0 + k8s.io/api v0.24.5 + k8s.io/apimachinery v0.24.5 ) require ( - github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/gofuzz v1.1.0 // indirect diff --git a/pkg/apis/go.sum b/pkg/apis/go.sum index 3f63a3fb29..6ac3693f56 100644 --- a/pkg/apis/go.sum +++ b/pkg/apis/go.sum @@ -131,9 +131,8 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= -github.com/emicklei/go-restful/v3 v3.9.0/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= @@ -760,7 +759,7 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -961,8 +960,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -991,8 +990,8 @@ 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.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1005,15 +1004,15 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY= k8s.io/api v0.22.2/go.mod h1:y3ydYpLJAaDI+BbSe2xmGcqxiWHmWjkEeIbiwHvnPR8= k8s.io/api v0.24.0/go.mod h1:5Jl90IUrJHUJYEMANRURMiVvJ0g7Ax7r3R1bqO8zx8I= -k8s.io/api v0.25.0 h1:H+Q4ma2U/ww0iGB78ijZx6DRByPz6/733jIuFpX70e0= -k8s.io/api v0.25.0/go.mod h1:ttceV1GyV1i1rnmvzT3BST08N6nGt+dudGrquzVQWPk= +k8s.io/api v0.24.5 h1:dujOrusqYFyeDIfDn4jVrLUGW4OUahkLBcaKjDLENrc= +k8s.io/api v0.24.5/go.mod h1:0qqWiH+FEHlS5MMv1NOodAcGzeOFgtsBOT7S8luxr7E= k8s.io/apiextensions-apiserver v0.22.2/go.mod h1:2E0Ve/isxNl7tWLSUDgi6+cmwHi5fQRdwGVCxbC+KFA= k8s.io/apiextensions-apiserver v0.24.0/go.mod h1:iuVe4aEpe6827lvO6yWQVxiPSpPoSKVjkq+MIdg84cM= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= k8s.io/apimachinery v0.22.2/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= k8s.io/apimachinery v0.24.0/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= -k8s.io/apimachinery v0.25.0 h1:MlP0r6+3XbkUG2itd6vp3oxbtdQLQI94fD5gCS+gnoU= -k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= +k8s.io/apimachinery v0.24.5 h1:6pbRsdruZAjwcbffR2lTN6U+KsF30m2GLTbgAlPU9fg= +k8s.io/apimachinery v0.24.5/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apiserver v0.22.2/go.mod h1:vrpMmbyjWrgdyOvZTSpsusQq5iigKNWv9o9KlDAbBHI= k8s.io/apiserver v0.24.0/go.mod h1:WFx2yiOMawnogNToVvUYT9nn1jaIkMKj41ZYCVycsBA= k8s.io/cli-runtime v0.22.2/go.mod h1:tkm2YeORFpbgQHEK/igqttvPTRIHFRz5kATlw53zlMI= @@ -1044,8 +1043,8 @@ k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-aggregator v0.24.0/go.mod h1:ftfs6Fi46z3cKzeF2kvNBPLbMlSKuqZbesJGNp/cQnw= k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= +k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kubectl v0.22.2/go.mod h1:BApg2j0edxLArCOfO0ievI27EeTQqBDMNU9VQH734iQ= k8s.io/metrics v0.22.2/go.mod h1:GUcsBtpsqQD1tKFS/2wCKu4ZBowwRncLOJH1rgWs3uw= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=