Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-1.10] Bump dependencies for CVE-2023-44487 #2586

Merged
merged 1 commit into from
Oct 31, 2023
Merged

[release-1.10] Bump dependencies for CVE-2023-44487 #2586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 30 additions & 32 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ require (
golang.org/x/sync v0.3.0
golang.org/x/tools v0.11.0
gomodules.xyz/jsonpatch/v2 v2.3.0
k8s.io/api v0.27.6
k8s.io/apiextensions-apiserver v0.27.6
k8s.io/apimachinery v0.27.6
k8s.io/api v0.27.7
k8s.io/apiextensions-apiserver v0.27.7
k8s.io/apimachinery v0.27.7
k8s.io/client-go v12.0.0+incompatible
k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5
k8s.io/utils v0.0.0-20230505201702-9f6742963106
Expand Down Expand Up @@ -94,8 +94,8 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.27.6 // indirect
k8s.io/component-base v0.27.6 // indirect
k8s.io/apiserver v0.27.7 // indirect
k8s.io/component-base v0.27.7 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand Down Expand Up @@ -146,32 +146,32 @@ exclude k8s.io/metrics v0.0.0

exclude k8s.io/sample-apiserver v0.0.0

// Pinned to v0.27.6
// Pinned to v0.27.7
replace (
k8s.io/api => k8s.io/api v0.27.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.6
k8s.io/apimachinery => k8s.io/apimachinery v0.28.0-alpha.0.0.20231013002001-194b6f8ddf62 // for CVE-2023-44487, while waiting for v0.27.7
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20231013035634-f41beb3c1c70 // for CVE-2023-44487, while waiting for v0.27.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.6
k8s.io/client-go => k8s.io/client-go v0.27.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.6
k8s.io/code-generator => k8s.io/code-generator v0.27.6
k8s.io/component-base => k8s.io/component-base v0.27.6
k8s.io/cri-api => k8s.io/cri-api v0.27.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.6
k8s.io/kubectl => k8s.io/kubectl v0.27.6
k8s.io/kubelet => k8s.io/kubelet v0.27.6
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.6
k8s.io/metrics => k8s.io/metrics v0.27.6
k8s.io/node-api => k8s.io/node-api v0.27.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.6
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.6
k8s.io/sample-controller => k8s.io/sample-controller v0.27.6
k8s.io/api => k8s.io/api v0.27.7
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.7
k8s.io/apimachinery => k8s.io/apimachinery v0.27.7
k8s.io/apiserver => k8s.io/apiserver v0.27.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.7
k8s.io/client-go => k8s.io/client-go v0.27.7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.7
k8s.io/code-generator => k8s.io/code-generator v0.27.7
k8s.io/component-base => k8s.io/component-base v0.27.7
k8s.io/cri-api => k8s.io/cri-api v0.27.7
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.7
k8s.io/kubectl => k8s.io/kubectl v0.27.7
k8s.io/kubelet => k8s.io/kubelet v0.27.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.7
k8s.io/metrics => k8s.io/metrics v0.27.7
k8s.io/node-api => k8s.io/node-api v0.27.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.7
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.7
k8s.io/sample-controller => k8s.io/sample-controller v0.27.7
)

replace (
Expand Down Expand Up @@ -202,5 +202,3 @@ replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1

// FIX: CVE-2023-44487
replace golang.org/x/net => golang.org/x/net v0.17.0

replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.15.3-0.20231013142619-9e09bc26e552 // while waiting for tagged v0.15.3
30 changes: 15 additions & 15 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,19 +465,19 @@ 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.27.6 h1:PBWu/lywJe2qQcshMjubzcBg7+XDZOo7O8JJAWuYtUo=
k8s.io/api v0.27.6/go.mod h1:AQYj0UsFCp3qJE7bOVnUuy4orCsXVkvHefnbYQiNWgk=
k8s.io/apiextensions-apiserver v0.27.6 h1:mOwSBJtThZhpJr+8gEkc3wFDIjq87E3JspR5mtZxIg8=
k8s.io/apiextensions-apiserver v0.27.6/go.mod h1:AVNlLYRrESG5Poo6ASRUhY2pvoKPcNt8y/IuZ4lx3o8=
k8s.io/apimachinery v0.28.0-alpha.0.0.20231013002001-194b6f8ddf62 h1:hYhrudSr/R5J5VrfTq81MJRnd995axeLQbne/M9AAv4=
k8s.io/apimachinery v0.28.0-alpha.0.0.20231013002001-194b6f8ddf62/go.mod h1:jBGQgTjkw99ef6q5hv1YurDd3BqKDk9YRxmX0Ozo0i8=
k8s.io/apiserver v0.0.0-20231013035634-f41beb3c1c70 h1:OYqGFoynm9vcmsAWJVfDiUpOnRnrsUgGjwia+vCtFo0=
k8s.io/apiserver v0.0.0-20231013035634-f41beb3c1c70/go.mod h1:AAQB22PK4uNQbYD3WKvF591yYXAboHkYFfXerOf29TA=
k8s.io/client-go v0.27.6 h1:vzI8804gpUtpMCNaFjIFyJrifH7u//LJCJPy8fQuYQg=
k8s.io/client-go v0.27.6/go.mod h1:PMsXcDKiJTW7PHJ64oEsIUJF319wm+EFlCj76oE5QXM=
k8s.io/code-generator v0.27.6/go.mod h1:DPung1sI5vBgn4AGKtlPRQAyagj/ir/4jI55ipZHVww=
k8s.io/component-base v0.27.6 h1:hF5WxX7Tpi9/dXAbLjPVkIA6CA6Pi6r9JOHyo0uCDYI=
k8s.io/component-base v0.27.6/go.mod h1:NvjLtaneUeb0GgMPpCBF+4LNB9GuhDHi16uUTjBhQfU=
k8s.io/api v0.27.7 h1:7yG4D3t/q4utJe2ptlRw9aPuxcSmroTsYxsofkQNl/A=
k8s.io/api v0.27.7/go.mod h1:ZNExI/Lhrs9YrLgVWx6jjHZdoWCTXfBXuFjt1X6olro=
k8s.io/apiextensions-apiserver v0.27.7 h1:YqIOwZAUokzxJIjunmUd4zS1v3JhK34EPXn+pP0/bsU=
k8s.io/apiextensions-apiserver v0.27.7/go.mod h1:x0p+b5a955lfPz9gaDeBy43obM12s+N9dNHK6+dUL+g=
k8s.io/apimachinery v0.27.7 h1:Gxgtb7Y/Rsu8ymgmUEaiErkxa6RY4oTd8kNUI6SUR58=
k8s.io/apimachinery v0.27.7/go.mod h1:jBGQgTjkw99ef6q5hv1YurDd3BqKDk9YRxmX0Ozo0i8=
k8s.io/apiserver v0.27.7 h1:E8sDHwfUug82YC1++qvE73QxihaXDqT4tr8XYBOEtc4=
k8s.io/apiserver v0.27.7/go.mod h1:OrLG9RwCOerutAlo8QJW5EHzUG9Dad7k6rgcDUNSO/w=
k8s.io/client-go v0.27.7 h1:+Xgh9OOKv6A3qdD4Dnl/0VOI5EvAv+0s/OseDxVVTwQ=
k8s.io/client-go v0.27.7/go.mod h1:dZ2kqcalYp5YZ2EV12XIMc77G6PxHWOJp/kclZr4+5Q=
k8s.io/code-generator v0.27.7/go.mod h1:w1YF/xQcTg+d9Ag+04xuRqER+q8rDnJ70ynLql8/RLA=
k8s.io/component-base v0.27.7 h1:kngM58HR9W9Nqpv7e4rpdRyWnKl/ABpUhLAZ+HoliMs=
k8s.io/component-base v0.27.7/go.mod h1:YGjlCVL1oeKvG3HSciyPHFh+LCjIEqsxz4BDR3cfHRs=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
Expand Down Expand Up @@ -506,8 +506,8 @@ kubevirt.io/managed-tenant-quota v1.1.10 h1:WKM2/JY0X0fWu24hhj+3l4KMqRD+xjeM1k/k
kubevirt.io/managed-tenant-quota v1.1.10/go.mod h1:E5CkhJR9WPj44suhmhJAuWdEHcdKnbh2cKSf5D5jMvk=
kubevirt.io/ssp-operator/api v0.18.3 h1:Fo36jUQqp1EAbH+tcaZt6MG873DbsfxYosqcIbLqj7Y=
kubevirt.io/ssp-operator/api v0.18.3/go.mod h1:RhBG1SUN1Oak+aceHW4x1jAAx+a6paOwt9Jq7K9G15g=
sigs.k8s.io/controller-runtime v0.15.3-0.20231013142619-9e09bc26e552 h1:Lnz8BlCtwwdJvMJjwZ6YinSP6uX+ACvUXH6x3HnS+/s=
sigs.k8s.io/controller-runtime v0.15.3-0.20231013142619-9e09bc26e552/go.mod h1:E6jwONbAKeCI7q5kCko3TB+UbuKKtNiHLJmmzs20vnw=
sigs.k8s.io/controller-runtime v0.15.3 h1:L+t5heIaI3zeejoIyyvLQs5vTVu/67IU2FfisVzFlBc=
sigs.k8s.io/controller-runtime v0.15.3/go.mod h1:kp4jckA4vTx281S/0Yk2LFEEQe67mjg+ev/yknv47Ds=
sigs.k8s.io/controller-tools v0.12.1 h1:GyQqxzH5wksa4n3YDIJdJJOopztR5VDM+7qsyg5yE4U=
sigs.k8s.io/controller-tools v0.12.1/go.mod h1:rXlpTfFHZMpZA8aGq9ejArgZiieHd+fkk/fTatY8A2M=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down
58 changes: 29 additions & 29 deletions tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require (
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/common v0.43.0
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.27.6
k8s.io/apimachinery v0.27.6
k8s.io/api v0.27.7
k8s.io/apimachinery v0.27.7
k8s.io/client-go v12.0.0+incompatible
k8s.io/utils v0.0.0-20230505201702-9f6742963106
kubevirt.io/api v1.0.1
Expand Down Expand Up @@ -47,7 +47,7 @@ require (
github.com/kubevirt/hyperconverged-cluster-operator v0.0.0-00010101000000-000000000000
github.com/openshift/custom-resource-status v1.1.2
gopkg.in/yaml.v3 v3.0.1
k8s.io/apiserver v0.27.6
k8s.io/apiserver v0.27.7
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4
kubevirt.io/ssp-operator/api v0.18.3
)
Expand Down Expand Up @@ -130,7 +130,7 @@ require (
google.golang.org/grpc v1.53.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/apiextensions-apiserver v0.27.6 // indirect
k8s.io/apiextensions-apiserver v0.27.7 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-aggregator v0.27.1 // indirect
k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 // indirect
Expand Down Expand Up @@ -185,32 +185,32 @@ exclude k8s.io/metrics v0.0.0

exclude k8s.io/sample-apiserver v0.0.0

// Pinned to v0.26.3
// Pinned to v0.26.10
replace (
k8s.io/api => k8s.io/api v0.26.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.3
k8s.io/apimachinery => k8s.io/apimachinery v0.26.3
k8s.io/apiserver => k8s.io/apiserver v0.26.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.3
k8s.io/client-go => k8s.io/client-go v0.26.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.3
k8s.io/code-generator => k8s.io/code-generator v0.26.3
k8s.io/component-base => k8s.io/component-base v0.26.3
k8s.io/cri-api => k8s.io/cri-api v0.26.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.3
k8s.io/kubectl => k8s.io/kubectl v0.26.3
k8s.io/kubelet => k8s.io/kubelet v0.26.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.3
k8s.io/metrics => k8s.io/metrics v0.26.3
k8s.io/node-api => k8s.io/node-api v0.26.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.3
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.3
k8s.io/sample-controller => k8s.io/sample-controller v0.26.3
k8s.io/api => k8s.io/api v0.26.10
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.10
k8s.io/apimachinery => k8s.io/apimachinery v0.26.10
k8s.io/apiserver => k8s.io/apiserver v0.26.10
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.10
k8s.io/client-go => k8s.io/client-go v0.26.10
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.10
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.10
k8s.io/code-generator => k8s.io/code-generator v0.26.10
k8s.io/component-base => k8s.io/component-base v0.26.10
k8s.io/cri-api => k8s.io/cri-api v0.26.10
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.10
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.10
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.10
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.10
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.10
k8s.io/kubectl => k8s.io/kubectl v0.26.10
k8s.io/kubelet => k8s.io/kubelet v0.26.10
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.10
k8s.io/metrics => k8s.io/metrics v0.26.10
k8s.io/node-api => k8s.io/node-api v0.26.10
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.10
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.10
k8s.io/sample-controller => k8s.io/sample-controller v0.26.10
)

replace (
Expand Down
Loading