Skip to content

Commit 4a73234

Browse files
Merge pull request #99 from openshift-cherrypick-robot/cherry-pick-98-to-release-0.16
[release-0.16] Update k8s.io/apimachinery for CVE fix
2 parents 9776083 + a12aef1 commit 4a73234

File tree

10 files changed

+226
-23
lines changed

10 files changed

+226
-23
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/onsi/gomega v1.27.8
1010
github.com/sirupsen/logrus v1.9.3
1111
k8s.io/api v0.26.3
12-
k8s.io/apimachinery v0.26.3
12+
k8s.io/apimachinery v0.26.10-0.20231013031804-4eaec8069337
1313
k8s.io/client-go v0.26.3
1414
k8s.io/klog v1.0.0
1515
k8s.io/kubectl v0.26.0
@@ -45,7 +45,7 @@ require (
4545
github.com/google/gofuzz v1.1.0 // indirect
4646
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
4747
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
48-
github.com/google/uuid v1.1.2 // indirect
48+
github.com/google/uuid v1.3.0 // indirect
4949
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
5050
github.com/imdario/mergo v0.3.12 // indirect
5151
github.com/inconshreveable/mousetrap v1.0.1 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLe
183183
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
184184
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
185185
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
186-
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
187-
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
186+
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
187+
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
188188
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
189189
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
190190
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -658,8 +658,8 @@ k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
658658
k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=
659659
k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
660660
k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
661-
k8s.io/apimachinery v0.26.3 h1:dQx6PNETJ7nODU3XPtrwkfuubs6w7sX0M8n61zHIV/k=
662-
k8s.io/apimachinery v0.26.3/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
661+
k8s.io/apimachinery v0.26.10-0.20231013031804-4eaec8069337 h1:EFmhWOObora6Lls8QMTY5KutQK+cTYvpOp0TRyD7dn0=
662+
k8s.io/apimachinery v0.26.10-0.20231013031804-4eaec8069337/go.mod h1:iT1ZP4JBP34wwM+ZQ8ByPEQ81u043iqAcsJYftX9amM=
663663
k8s.io/cli-runtime v0.26.0 h1:aQHa1SyUhpqxAw1fY21x2z2OS5RLtMJOCj7tN4oq8mw=
664664
k8s.io/cli-runtime v0.26.0/go.mod h1:o+4KmwHzO/UK0wepE1qpRk6l3o60/txUZ1fEXWGIKTY=
665665
k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=

vendor/github.com/google/uuid/hash.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/uuid/null.go

Lines changed: 118 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/uuid/sql.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/uuid/uuid.go

Lines changed: 52 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/uuid/version4.go

Lines changed: 34 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apimachinery/pkg/runtime/converter.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ github.com/google/pprof/profile
9999
# github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
100100
## explicit; go 1.13
101101
github.com/google/shlex
102-
# github.com/google/uuid v1.1.2
102+
# github.com/google/uuid v1.3.0
103103
## explicit
104104
github.com/google/uuid
105105
# github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7
@@ -425,7 +425,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset
425425
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme
426426
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1
427427
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1
428-
# k8s.io/apimachinery v0.26.3
428+
# k8s.io/apimachinery v0.26.10-0.20231013031804-4eaec8069337
429429
## explicit; go 1.19
430430
k8s.io/apimachinery/pkg/api/equality
431431
k8s.io/apimachinery/pkg/api/errors

0 commit comments

Comments
 (0)