From 47b55ce00e3a8a15f48e434e64626dc878a149e0 Mon Sep 17 00:00:00 2001 From: sheidkamp Date: Fri, 7 Jul 2023 18:46:38 -0400 Subject: [PATCH] update --- go.mod | 14 +++++++------- go.sum | 25 ++++++++++++------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 5b8d4b98377..baf2c93b604 100644 --- a/go.mod +++ b/go.mod @@ -48,15 +48,15 @@ require ( github.com/saiskee/gettercheck v0.0.0-20210820204958-38443d06ebe0 github.com/sergi/go-diff v1.1.0 github.com/solo-io/go-list-licenses v0.1.4 - github.com/solo-io/go-utils v0.24.0 - github.com/solo-io/k8s-utils v0.3.0 + github.com/solo-io/go-utils v0.24.6-0.20230707210102-7026a58d55f0 + github.com/solo-io/k8s-utils v0.4.1-0.20230707192007-91d7ffb2e785 github.com/solo-io/protoc-gen-ext v0.0.18 github.com/solo-io/protoc-gen-openapi v0.1.0 github.com/solo-io/skv2 v0.29.2 // Pinned to the `gloo-edge-safe-hasher` tag of solo-apis github.com/solo-io/solo-apis v0.0.0-20220923183548-9746539fc625 - github.com/solo-io/solo-kit v0.31.0 + github.com/solo-io/solo-kit v0.32.1-0.20230707224505-5e77a4f1b945 github.com/spf13/afero v1.9.2 github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 @@ -64,7 +64,7 @@ require ( go.opencensus.io v0.24.0 go.uber.org/goleak v1.2.1 go.uber.org/multierr v1.6.0 - go.uber.org/zap v1.21.0 + go.uber.org/zap v1.24.0 golang.org/x/crypto v0.5.0 golang.org/x/sync v0.1.0 golang.org/x/tools v0.7.0 @@ -83,7 +83,7 @@ require ( k8s.io/utils v0.0.0-20230209194617-a36077c30491 knative.dev/networking v0.0.0-20211210083629-bace06e98aee knative.dev/pkg v0.0.0-20211206113427-18589ac7627e - sigs.k8s.io/controller-runtime v0.13.1 + sigs.k8s.io/controller-runtime v0.14.6 sigs.k8s.io/yaml v1.3.0 ) @@ -276,7 +276,7 @@ require ( golang.org/x/sys v0.6.0 // indirect golang.org/x/term v0.6.0 // indirect golang.org/x/text v0.8.0 // indirect - golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect + golang.org/x/time v0.3.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect @@ -328,7 +328,7 @@ replace ( // see https://github.com/solo-io/gloo/issues/5719 google.golang.org/grpc => google.golang.org/grpc v1.40.0 - // Pin Kube libraries to v0.25 + // Pin Kube libraries to v0.27 // These should be upgraded collectively k8s.io/api => k8s.io/api v0.27.3 k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.3 diff --git a/go.sum b/go.sum index f9d1ce02cae..8f6e5387b96 100644 --- a/go.sum +++ b/go.sum @@ -1476,12 +1476,12 @@ github.com/solo-io/go-utils v0.19.0/go.mod h1:If8NiehXROCFU65PGeDTrrZCNA5gJXvbcV github.com/solo-io/go-utils v0.20.2/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c= github.com/solo-io/go-utils v0.21.4/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c= github.com/solo-io/go-utils v0.21.6/go.mod h1:N6jeYnrAKq5uGv6m/hBkJ+g6i3AwgkyfVoaDlQ/z64o= -github.com/solo-io/go-utils v0.24.0 h1:zrcIjfVtW2bcJH0Juy4Q0qEZtQ67tqVr0aeq6btwBV0= -github.com/solo-io/go-utils v0.24.0/go.mod h1:2ds5++iv1FGox0/aWz/DAiRYTIb6r4yiM+VSF7sAyL4= +github.com/solo-io/go-utils v0.24.6-0.20230707210102-7026a58d55f0 h1:fMZV7SgujvSclUiuNCHAdfeLAVHURE8e23OfmaRttQ0= +github.com/solo-io/go-utils v0.24.6-0.20230707210102-7026a58d55f0/go.mod h1:Z7IpyZSomStnM7VP9Gpt/4o0xiQf53UUOK35ATJTeD8= github.com/solo-io/k8s-utils v0.0.1/go.mod h1:53N9+9Gl2MwqIZJ7/ocA9gKvWt+6z7MPD2qKQix7oFE= github.com/solo-io/k8s-utils v0.0.8/go.mod h1:Cg2ymG0xhLdyS3NJ0D98yxiSWjAKYPNopzPTwVDl7e4= -github.com/solo-io/k8s-utils v0.3.0 h1:K27Gb/gTEexHK27VMOJ1tSW4PBo18PClo9w/L89UNvw= -github.com/solo-io/k8s-utils v0.3.0/go.mod h1:xQlivmqqWsGx16zgpnX4QT9E+Re6Mkre+4tYybH4pHM= +github.com/solo-io/k8s-utils v0.4.1-0.20230707192007-91d7ffb2e785 h1:CDRxGu0hlnRo8HEMbIC6aom6UOColo4fsfOH7FN5Kq4= +github.com/solo-io/k8s-utils v0.4.1-0.20230707192007-91d7ffb2e785/go.mod h1:EJI4bCrcLLJRyVfxvk6LXn+71XUKGrXtMbF1CtXFZPQ= github.com/solo-io/protoc-gen-ext v0.0.13/go.mod h1:/U/jMDtVI7R6N323sfaUXK9Mmo54D7SY3pP7JtI/kMo= github.com/solo-io/protoc-gen-ext v0.0.17/go.mod h1:iGyCvmKmhJNXs5MgBcYFBF0om7LDnCVD2WwhOZGnqeA= github.com/solo-io/protoc-gen-ext v0.0.18 h1:zSAL8NzWpJUGYoA5IyjHiKASNyHjR0uxBQ7eQS94i3A= @@ -1494,8 +1494,8 @@ github.com/solo-io/skv2 v0.29.2/go.mod h1:wDEsSpaSCduOtMOrAVWKGM783MSFGg4xC+9y8s github.com/solo-io/solo-apis v0.0.0-20220923183548-9746539fc625 h1:Tah0/lj7EoXWCdkKUOMgl+uXhH7zAy4mlCnoJRMUFzg= github.com/solo-io/solo-apis v0.0.0-20220923183548-9746539fc625/go.mod h1:HeaqtVvRW8TJMzGDZMP9I9HOixQuZGHfw2J5sxE1qlQ= github.com/solo-io/solo-kit v0.23.0/go.mod h1:uCOi8RQ3MetHXsRFvVKPzafYySUvFuPxB+gvo7ScRR8= -github.com/solo-io/solo-kit v0.31.0 h1:s61jP17ul7WNgOvKIsM7UYysaaKE3ZomXt4OG5WhIJk= -github.com/solo-io/solo-kit v0.31.0/go.mod h1:L+DuD0vSZ6IlgoYVC3Ji0jHlI7pzvUotLBVfEM1RbQI= +github.com/solo-io/solo-kit v0.32.1-0.20230707224505-5e77a4f1b945 h1:pjgSZZDyZxShu7mjn0qgn2DKfREp4Ir1/8PJuEtMwGs= +github.com/solo-io/solo-kit v0.32.1-0.20230707224505-5e77a4f1b945/go.mod h1:887XSfyDx3yAldmduboqzT7Yvo4yvlUbGdz7XNJi8GY= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= @@ -1690,7 +1690,6 @@ go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= @@ -1711,8 +1710,8 @@ go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= -go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= goji.io v2.0.0+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk= goji.io v2.0.2+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -2090,8 +2089,8 @@ golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U= -golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2496,8 +2495,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISX sigs.k8s.io/aws-iam-authenticator v0.5.0/go.mod h1:hGGN2wp01A1NU/88s8Wjfa3nY5bZYdeZn1aAAb8j1SI= sigs.k8s.io/controller-runtime v0.6.2/go.mod h1:vhcq/rlnENJ09SIRp3EveTaZ0yqH526hjf9iJdbUJ/E= sigs.k8s.io/controller-runtime v0.7.0/go.mod h1:pJ3YBrJiAqMAZKi6UVGuE98ZrroV1p+pIhoHsMm9wdU= -sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg= -sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI= +sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92KcwQA= +sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=