From 0d6cd4e13262526cdbe78799f88958064f0271c3 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 17 Mar 2022 11:16:06 +0100 Subject: [PATCH] Upgrade to blang/semver/v4 v4.0.0 This is the first version to be fully go-mod-compatible. Signed-off-by: Stephen Kitt Kubernetes-commit: 080c6c711ebf527d5494732b4b41d074ab02733f --- go.mod | 25 +++++++++++++------------ go.sum | 17 +++-------------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index 5c5f061c..84bbe257 100644 --- a/go.mod +++ b/go.mod @@ -12,12 +12,12 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd - k8s.io/api v0.0.0-20220327010943-9431395a90d0 - k8s.io/apimachinery v0.0.0-20220327010740-1992dccd17de - k8s.io/apiserver v0.0.0-20220328172932-8c9e58df375b - k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad - k8s.io/code-generator v0.0.0-20220327010549-a207ba43f29b - k8s.io/component-base v0.0.0-20220328131428-cf687172c5c1 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/apiserver v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/code-generator v0.0.0 + k8s.io/component-base v0.0.0 k8s.io/klog/v2 v2.60.1 k8s.io/kube-openapi v0.0.0-20220324211241-9f9c01d62a3a k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 @@ -25,10 +25,11 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220327010943-9431395a90d0 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220327010740-1992dccd17de - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220328172932-8c9e58df375b - k8s.io/client-go => k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220327010549-a207ba43f29b - k8s.io/component-base => k8s.io/component-base v0.0.0-20220328131428-cf687172c5c1 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/component-base => ../component-base + k8s.io/kube-aggregator => ../kube-aggregator ) diff --git a/go.sum b/go.sum index 2542296b..b9dcdeba 100644 --- a/go.sum +++ b/go.sum @@ -68,6 +68,7 @@ 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 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -77,8 +78,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= @@ -948,18 +949,6 @@ 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-20220327010943-9431395a90d0 h1:X+CjFuKiWUYmXxuNueT2v0YNHDZhiRJ0389k24Fh1cg= -k8s.io/api v0.0.0-20220327010943-9431395a90d0/go.mod h1:OHmmfP+B0EkV7rltm6KDhsy7UJUjc3nPo97jKZwLIkM= -k8s.io/apimachinery v0.0.0-20220327010740-1992dccd17de h1:YQ7cVEFpw9qaBjGa5/JYzHq/Xi/mKBAeUmEt6NwljMc= -k8s.io/apimachinery v0.0.0-20220327010740-1992dccd17de/go.mod h1:WkN7hnr/sIpKTK8v3BZKqLkdqTMz00TBdMWqE0M0O7Q= -k8s.io/apiserver v0.0.0-20220328172932-8c9e58df375b h1:gPp8WDs8INofE1+x6ky/a0y1sLY4qi0kA5lQrrhOHsM= -k8s.io/apiserver v0.0.0-20220328172932-8c9e58df375b/go.mod h1:QZ0P6Gy+3pAAxZxq2hT37b0s5zv3gzS1DkeP5TA3p50= -k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad h1:v2udgOBdg/+3kM7nGJtQfjvnlsjgA0wdR9sJjiX7UfQ= -k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad/go.mod h1:HCq7QlEN/lEZ7hg4X9ldPo4rbktT3jtB83/5IJmurlw= -k8s.io/code-generator v0.0.0-20220327010549-a207ba43f29b h1:/W7LKW7INcyQg+4t9MiVKiAcNEfcEJKr3GNFwJTXwaM= -k8s.io/code-generator v0.0.0-20220327010549-a207ba43f29b/go.mod h1:K+f3PS8AJPkGO9NJoAqq6J1NMsr37Ey1IaQrQ2c97yQ= -k8s.io/component-base v0.0.0-20220328131428-cf687172c5c1 h1:u12RSj/wUOlBMijVItJMa5oFTamtWwcJGpl0m64M3Vc= -k8s.io/component-base v0.0.0-20220328131428-cf687172c5c1/go.mod h1:bv8VKJjKvywGpxYTIs9+A7blbVBaoOSApzZwU1DLK/8= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=