From e43b369bcf457797348541916bd6a2459248eedf Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 17 Aug 2021 10:13:40 -0400 Subject: [PATCH] Bump k8s.io/kube-openapi Updates to preserve openapi ipv4 validation compatibility with pre-go1.17 behavior Kubernetes-commit: b15c2130aad497add782820c415c59952b4e75a8 --- go.mod | 35 ++++++++++++++++++----------------- go.sum | 24 +++++------------------- 2 files changed, 23 insertions(+), 36 deletions(-) diff --git a/go.mod b/go.mod index 2f3651e0..8dd9e626 100644 --- a/go.mod +++ b/go.mod @@ -31,28 +31,29 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20210812040324-2491c6b734cf - k8s.io/apimachinery v0.0.0-20210811080139-1af25b613b64 - k8s.io/cli-runtime v0.0.0-20210809162519-1a9ed8304cb3 - k8s.io/client-go v0.0.0-20210812120555-d6c83109f030 - k8s.io/component-base v0.0.0-20210809161112-4a2a74898ac3 - k8s.io/component-helpers v0.0.0-20210809161214-4a6b4f4e9479 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/cli-runtime v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 + k8s.io/component-helpers v0.0.0 k8s.io/klog/v2 v2.9.0 - k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e - k8s.io/metrics v0.0.0-20210817202716-60b3cc171c4f - k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 + k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 + k8s.io/metrics v0.0.0 + k8s.io/utils v0.0.0-20210802155522-efc7438f0176 sigs.k8s.io/kustomize/kustomize/v4 v4.2.0 sigs.k8s.io/kustomize/kyaml v0.11.0 sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210812040324-2491c6b734cf - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210811080139-1af25b613b64 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210809162519-1a9ed8304cb3 - k8s.io/client-go => k8s.io/client-go v0.0.0-20210812120555-d6c83109f030 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210817200015-2717b3a3e317 - k8s.io/component-base => k8s.io/component-base v0.0.0-20210809161112-4a2a74898ac3 - k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210809161214-4a6b4f4e9479 - k8s.io/metrics => k8s.io/metrics v0.0.0-20210817202716-60b3cc171c4f + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/cli-runtime => ../cli-runtime + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/component-base => ../component-base + k8s.io/component-helpers => ../component-helpers + k8s.io/kubectl => ../kubectl + k8s.io/metrics => ../metrics ) diff --git a/go.sum b/go.sum index 45cd8ab5..896c9f11 100644 --- a/go.sum +++ b/go.sum @@ -873,31 +873,17 @@ 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-20210812040324-2491c6b734cf h1:5NV+I0ZM85RGbo2u0pP31ABu11NrURniSqJxd/HVVL8= -k8s.io/api v0.0.0-20210812040324-2491c6b734cf/go.mod h1:pV+uK+CzsU4HKxt2g6rbyKWQWvDx5/erukDsyeLigWc= -k8s.io/apimachinery v0.0.0-20210811080139-1af25b613b64 h1:nQCb3+Rke2THnETOqf9o9cAj6/hLFj7lj3KvcUp53kg= -k8s.io/apimachinery v0.0.0-20210811080139-1af25b613b64/go.mod h1:Rk+pTpcX+fNVsc3nfpy3fDaMhRjZTuFMcjsATCvV6Uk= -k8s.io/cli-runtime v0.0.0-20210809162519-1a9ed8304cb3 h1:aCwQ094GBCZp2LoVB43YRlu3zoQHXmayhM9kwSzXUEs= -k8s.io/cli-runtime v0.0.0-20210809162519-1a9ed8304cb3/go.mod h1:Tb5cpgp+fBWwP81Ts6JiGahKeoeEH0UBPfOOKiSR/sE= -k8s.io/client-go v0.0.0-20210812120555-d6c83109f030 h1:UsviIHXsX5HcxYfwVLW85+fSlCR+zK0fhp86mfRIdMI= -k8s.io/client-go v0.0.0-20210812120555-d6c83109f030/go.mod h1:Khv/BCS4R4WGGQadukxCwvDYCXTfaNvbCNEPKW0CIDc= -k8s.io/code-generator v0.0.0-20210817200015-2717b3a3e317/go.mod h1:A5xy5OzWVWfZZym1vg43P2nbPnuz/KJapnmGrz/lCZE= -k8s.io/component-base v0.0.0-20210809161112-4a2a74898ac3 h1:yW4snlTRtYAkQKAFP8vBnpeGIgUeokrQxx4zHXgc8cA= -k8s.io/component-base v0.0.0-20210809161112-4a2a74898ac3/go.mod h1:pjD1FYxCK1UpwBfB61idblVuygZ4h7QEJGHiy3bNA7I= -k8s.io/component-helpers v0.0.0-20210809161214-4a6b4f4e9479 h1:2NRcPzFcW/xSLGeBO0SsgW4JWFVTviKSIhEcbBEjEX4= -k8s.io/component-helpers v0.0.0-20210809161214-4a6b4f4e9479/go.mod h1:jtblhjHZPoBbyw50ygqbVU8zwCg17pDMfKjxsGKik0k= 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-20201214224949-b6c5ce23f027/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= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/metrics v0.0.0-20210817202716-60b3cc171c4f h1:6IJT+5EsOMo/fhi93hu+O3pzG91Humn8UzYV0NEqQ9Q= -k8s.io/metrics v0.0.0-20210817202716-60b3cc171c4f/go.mod h1:tD65h+Lltkq0q8LMnFH786Bibt5OHYdoMgVEUJ9qx8A= -k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 h1:imL9YgXQ9p7xmPzHFm/vVd/cF78jad+n4wK1ABwYtMM= -k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 h1:Xxl9TLJ30BJ1pGWfGZnqbpww2rwOt3RAzbSz+omQGtg= +k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8/go.mod h1:foAE7XkrXQ1Qo2eWsW/iWksptrVdbl6t+vscSdmmGjk= +k8s.io/utils v0.0.0-20210802155522-efc7438f0176 h1:Mx0aa+SUAcNRQbs5jUzV8lkDlGFU8laZsY9jrcVX5SY= +k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=