kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #121575 from apelisse/update-smd 

Update sigs.k8s.io/structured-merge-diff to v4.4.0

Kubernetes-commit: 593a17d3b6381bfdbf3bc3b36f56cad30d1531df
This commit is contained in:
Kubernetes Publisher 2023-11-01 01:51:17 +01:00
parent caeb7958ad dfe5e25e6b
commit c78de1fe6c
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
go.mod
View File

@ -42,17 +42,17 @@ require (
google.golang.org/protobuf v1.31.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20231031211309-14869ee3b213
k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5
k8s.io/client-go v0.0.0-20231031211617-965bc8db9daa
k8s.io/component-base v0.0.0-20231027174419-7eefecff8918
k8s.io/api v0.0.0-20231101011356-6106c48f363d
k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
k8s.io/client-go v0.0.0-20231101011735-7523a344f785
k8s.io/component-base v0.0.0-20231101012453-36eaf6a3a115
k8s.io/klog/v2 v2.100.1
k8s.io/kms v0.0.0-20231031012129-523a5e8e70a1
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
sigs.k8s.io/structured-merge-diff/v4 v4.3.0
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
sigs.k8s.io/yaml v1.3.0
)
@ -126,9 +126,9 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20231031211309-14869ee3b213
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5
k8s.io/client-go => k8s.io/client-go v0.0.0-20231031211617-965bc8db9daa
k8s.io/component-base => k8s.io/component-base v0.0.0-20231027174419-7eefecff8918
k8s.io/api => k8s.io/api v0.0.0-20231101011356-6106c48f363d
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8
k8s.io/client-go => k8s.io/client-go v0.0.0-20231101011735-7523a344f785
k8s.io/component-base => k8s.io/component-base v0.0.0-20231101012453-36eaf6a3a115
k8s.io/kms => k8s.io/kms v0.0.0-20231031012129-523a5e8e70a1
)

20
go.sum
View File

@ -398,14 +398,14 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20231031211309-14869ee3b213 h1:Lf1wKygIftBuj1Lr51emTskN7QSwvd51XFkYMUGgRsM=
k8s.io/api v0.0.0-20231031211309-14869ee3b213/go.mod h1:qAbMauUgqfsYnwf64MNh5zf3WAoroYWSHW05o2JiGqk=
k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5 h1:EiPDmPd4kR0WxYWUVNBrfSTW6Bz9gbLIEBBN44c59zo=
k8s.io/apimachinery v0.0.0-20231031211055-458fd90fd7a5/go.mod h1:w0F2e93v67dkDnVXN80UeHkHMV8q0UIPd3JmttbIV2M=
k8s.io/client-go v0.0.0-20231031211617-965bc8db9daa h1:fmVYKIvWPU7St4vDMNZBfk/geLzru1YthrAg8M2dLAY=
k8s.io/client-go v0.0.0-20231031211617-965bc8db9daa/go.mod h1:ek0ip0QH5c32eMq8KYKNp0kg4g1wpkFmx3YCY1DJZ8U=
k8s.io/component-base v0.0.0-20231027174419-7eefecff8918 h1:REROa5iZinlgOCnq1UxCSpcjE3sy2wqQ2WKcrKw/tBM=
k8s.io/component-base v0.0.0-20231027174419-7eefecff8918/go.mod h1:pWKBYrw3h6RE9E/iVyrVjoUpYforObgVsPP7aCVGeic=
k8s.io/api v0.0.0-20231101011356-6106c48f363d h1:UGmDzNqOmVt+OcwK8zqQY+Rt7jex0EqP8teb11hhVNo=
k8s.io/api v0.0.0-20231101011356-6106c48f363d/go.mod h1:lBfRF4cZnQAE1dC8eo5d+GYNg4AVK8XhcdF7OeZP3vw=
k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8 h1:ZmtmO/iO+jAzN4d6CitAv4GcBeoL900OIyD8hQH+BOY=
k8s.io/apimachinery v0.0.0-20231101011123-96ae302100a8/go.mod h1:Jstex+Vd1bLMOri3JGwKux2G++hIIH+6+/Gbrq+DhOQ=
k8s.io/client-go v0.0.0-20231101011735-7523a344f785 h1:RCG2X8THR9tj0NKW3r7e6WuC4O9PZTw0RVKBntWjVUw=
k8s.io/client-go v0.0.0-20231101011735-7523a344f785/go.mod h1:cTK5cDp0KQpzCXVivM3YixBMwcJdet4JFzdnwWQfgKk=
k8s.io/component-base v0.0.0-20231101012453-36eaf6a3a115 h1:hSeGKNDD82ZZX9xSla8OH02UzwNXDLfxIaYtTFbAmNg=
k8s.io/component-base v0.0.0-20231101012453-36eaf6a3a115/go.mod h1:NSugshDiYqn5/1FWEweKICkcNSIwfNS+4n4nVM1kBk8=
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-20231031012129-523a5e8e70a1 h1:NjJWKqxAfC+bj/B0XSfbl7QSKHGgDturoUCMoRpDOwA=
@ -418,7 +418,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2S
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk=
sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=