Compare commits

...

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
ed2f990007 Update dependencies to v0.28.2 tag 2023-09-13 19:16:23 +00:00
Kubernetes Publisher
463d16ac5e Merge pull request #120329 from liggitt/automated-cherry-pick-of-#120327-upstream-release-1.28
Automated cherry pick of #120327: Revert to json-patch 4.12.0

Kubernetes-commit: 797b3cf45ec77becceb7d6ae4deb6f6b293fdbf5
2023-09-04 12:08:15 +00:00
Jordan Liggitt
0fe0ad0882 Revert to json-patch 4.12.0
Kubernetes-commit: 8c7c4f3fc4dcabb1ab2c004b42ff91ebf2e78ede
2023-08-31 19:01:37 -04:00
2 changed files with 19 additions and 19 deletions

18
go.mod
View File

@@ -5,17 +5,17 @@ module k8s.io/sample-controller
go 1.20
require (
k8s.io/api v0.0.0-20230807203228-9ab79eae448c
k8s.io/apimachinery v0.0.0-20230807201834-4b14f804a0ba
k8s.io/client-go v0.0.0-20230807210255-dcfe307184d9
k8s.io/code-generator v0.0.0-20230807201159-791c213a776b
k8s.io/api v0.28.2
k8s.io/apimachinery v0.28.2
k8s.io/client-go v0.28.2
k8s.io/code-generator v0.28.2
k8s.io/klog/v2 v2.100.1
)
require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -58,8 +58,8 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20230807203228-9ab79eae448c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230807201834-4b14f804a0ba
k8s.io/client-go => k8s.io/client-go v0.0.0-20230807210255-dcfe307184d9
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230807201159-791c213a776b
k8s.io/api => k8s.io/api v0.28.2
k8s.io/apimachinery => k8s.io/apimachinery v0.28.2
k8s.io/client-go => k8s.io/client-go v0.28.2
k8s.io/code-generator => k8s.io/code-generator v0.28.2
)

20
go.sum
View File

@@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -143,14 +143,14 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20230807203228-9ab79eae448c h1:E+jFr194rFrWTK9209MlCLuRGovXjqWtirFiUeJUutA=
k8s.io/api v0.0.0-20230807203228-9ab79eae448c/go.mod h1:QGL40BliXvUNDczpIQMGfQgote0zzKfOOUdO3bAV9j0=
k8s.io/apimachinery v0.0.0-20230807201834-4b14f804a0ba h1:hm5tfwSEPx02v3nrxlMJ0zl1/aoppw537sDgbYGiAb8=
k8s.io/apimachinery v0.0.0-20230807201834-4b14f804a0ba/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw=
k8s.io/client-go v0.0.0-20230807210255-dcfe307184d9 h1:phEuxkIdxpnf6ucJeuDQ8mG4LZz49Sr92zvoKqmQDfs=
k8s.io/client-go v0.0.0-20230807210255-dcfe307184d9/go.mod h1:qY1svFkrpY1bqeUowwBpcTQkX/F5s4x/SVgViN8Y7HA=
k8s.io/code-generator v0.0.0-20230807201159-791c213a776b h1:SQbgU/KO+8dA4z1FG2Miatu7XYb3oDc7tzbycneiyDY=
k8s.io/code-generator v0.0.0-20230807201159-791c213a776b/go.mod h1:ueeSJZJ61NHBa0ccWLey6mwawum25vX61nRZ6WOzN9A=
k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw=
k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg=
k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ=
k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU=
k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY=
k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY=
k8s.io/code-generator v0.28.2 h1:u47guga1rCWLnEnffF09p+cqj8B20oHOLoQ1lb1HGtQ=
k8s.io/code-generator v0.28.2/go.mod h1:ueeSJZJ61NHBa0ccWLey6mwawum25vX61nRZ6WOzN9A=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=