Merge pull request #118014 from liggitt/mapstructure

Update kube-openapi, drop mapstructure

Kubernetes-commit: ea4cc84cf7c47d2bc45730ea2563bc320dfe5ff1
This commit is contained in:
Kubernetes Publisher 2023-05-15 14:41:35 -07:00
commit 503fadf9e7
2 changed files with 15 additions and 18 deletions

15
go.mod
View File

@ -42,12 +42,12 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20230515170019-2f9553831ec2
k8s.io/apimachinery v0.0.0-20230515165653-4ead302a5627
k8s.io/client-go v0.0.0-20230515170428-578f82a56868
k8s.io/component-base v0.0.0-20230515171227-724dd82328aa
k8s.io/apimachinery v0.0.0-20230516005413-9d33220bdac3
k8s.io/client-go v0.0.0-20230516011209-c2105c181594
k8s.io/component-base v0.0.0-20230516012726-18782b4b48a0
k8s.io/klog/v2 v2.100.1
k8s.io/kms v0.0.0-20230515171440-e664c8d39ad7
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/apiserver-network-proxy/konnectivity-client v0.1.2
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
@ -88,7 +88,6 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
@ -125,8 +124,8 @@ 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/client-go => k8s.io/client-go v0.0.0-20230515170428-578f82a56868
k8s.io/component-base => k8s.io/component-base v0.0.0-20230515171227-724dd82328aa
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230516005413-9d33220bdac3
k8s.io/client-go => k8s.io/client-go v0.0.0-20230516011209-c2105c181594
k8s.io/component-base => k8s.io/component-base v0.0.0-20230516012726-18782b4b48a0
k8s.io/kms => k8s.io/kms v0.0.0-20230515171440-e664c8d39ad7
)

18
go.sum
View File

@ -291,8 +291,6 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM=
github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@ -877,18 +875,18 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
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/client-go v0.0.0-20230515170428-578f82a56868 h1:MZxbygj0uj2pHxaRk+OILd9GqyTFyHQQ5/hJJ/6KQAQ=
k8s.io/client-go v0.0.0-20230515170428-578f82a56868/go.mod h1:YiLQuPd4rQic58gv3w0K+UAHSGaSd3EtWzl7XsLXAr0=
k8s.io/component-base v0.0.0-20230515171227-724dd82328aa h1:hPjjtm3KLXBLMBKur9o6JSR4uj4fDGbkpNjkPZycxyA=
k8s.io/component-base v0.0.0-20230515171227-724dd82328aa/go.mod h1:AIPaXCNTy5wNjKqS+Yyy/OQ/WQT0GZyq0YW3lqClkHs=
k8s.io/apimachinery v0.0.0-20230516005413-9d33220bdac3 h1:y8ZaORaq511hX1RbGJS8AFR5UdxeW+/nJYZVqTWG8TY=
k8s.io/apimachinery v0.0.0-20230516005413-9d33220bdac3/go.mod h1:duqOQ9WfGiD/x7zVH/k6rR0s2h9fq5UwPoY53R7iLQ4=
k8s.io/client-go v0.0.0-20230516011209-c2105c181594 h1:jLC3LaqJFz9sqcj+Dx5fyzYhVucZSsCHvqGnFzf5jkk=
k8s.io/client-go v0.0.0-20230516011209-c2105c181594/go.mod h1:ReQGPEgsIQVSIWjDq5Bx5/PiwYURMeAWHpqWeeMM4ck=
k8s.io/component-base v0.0.0-20230516012726-18782b4b48a0 h1:vfl3DlJYl4j3X/naJv7zGmLNoqRjoq+Ll4UyovTumjk=
k8s.io/component-base v0.0.0-20230516012726-18782b4b48a0/go.mod h1:iqdRj+rbQGbWk3G4Ivk0LBLaa6wlzESfW4zCY27YH0o=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kms v0.0.0-20230515171440-e664c8d39ad7 h1:1uMHnoLHSazVSB21Jqmy+wAHIY/z5zPcQYDH+vUmmGk=
k8s.io/kms v0.0.0-20230515171440-e664c8d39ad7/go.mod h1:Hc8q4tI4dC9jrV5gAk01AD8ZGlYta2feitWl8lqtcYw=
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=