From 9cbecd3bd0c37fbcee337c7bbf4f7cbc3d92f254 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 15 May 2023 16:42:00 -0400 Subject: [PATCH] Update kube-openapi, drop mapstructure Kubernetes-commit: d6d1dbdd82a412a06cdf458ca40836a018670131 --- go.mod | 11 ++++++----- go.sum | 8 ++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index acef6d9b..cffbc682 100644 --- a/go.mod +++ b/go.mod @@ -23,10 +23,10 @@ require ( golang.org/x/term v0.7.0 golang.org/x/time v0.3.0 google.golang.org/protobuf v1.30.0 - k8s.io/api v0.0.0-20230515170019-2f9553831ec2 - k8s.io/apimachinery v0.0.0-20230515165653-4ead302a5627 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 k8s.io/klog/v2 v2.100.1 - k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f + k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd sigs.k8s.io/structured-merge-diff/v4 v4.2.3 @@ -60,6 +60,7 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20230515170019-2f9553831ec2 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230515165653-4ead302a5627 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go ) diff --git a/go.sum b/go.sum index df113cef..4ee8811b 100644 --- a/go.sum +++ b/go.sum @@ -479,14 +479,10 @@ 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-20230515170019-2f9553831ec2 h1:ZHyoWIXElhnLI03GkOsebYT1uqYowGjuVCbxBqcjjGw= -k8s.io/api v0.0.0-20230515170019-2f9553831ec2/go.mod h1:qZNz3vKcyZb5wFaBlHqUjHk7D5XhIaXu/d/df6PjNKk= -k8s.io/apimachinery v0.0.0-20230515165653-4ead302a5627 h1:3pUe0yhjlC0w546TQHriCjlrl80ClEQ2skJsYkw3hAI= -k8s.io/apimachinery v0.0.0-20230515165653-4ead302a5627/go.mod h1:eDu1JolS718v1gie0idFNNduKVOGsC1CksrbgSWNoLE= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 h1:azYPdzztXxPSa8wb+hksEKayiz0o+PPisO/d+QhWnoo= +k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5/go.mod h1:kzo02I3kQ4BTtEfVLaPbjvCkX97YqGve33wzlb3fofQ= k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=