Merge pull request #445 from andyzhangx/CVE-2023-45288

fix: CVE-2024-3177, CVE-2023-45288
kubernetes-sigs · May 11, 2024 · 7f3f30b · 7f3f30b
2 parents 4f81db7 + 6e95fbf
commit 7f3f30b
Show file tree

Hide file tree

Showing 102 changed files with 10,458 additions and 5,923 deletions.
diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml
@@ -15,7 +15,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v5
         with:
-          go-version: ^1.19
+          go-version: 1.22.3
 
       - name: Build an image from Dockerfile
         run: |

diff --git a/go.mod b/go.mod
@@ -9,15 +9,15 @@ require (
 	github.com/onsi/gomega v1.27.4
 	github.com/prometheus/client_golang v1.14.0
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/sys v0.17.0
+	golang.org/x/sys v0.20.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.27.8
-	k8s.io/apimachinery v0.27.8
-	k8s.io/apiserver v0.27.8
-	k8s.io/client-go v0.27.8
-	k8s.io/component-base v0.27.8
+	k8s.io/api v0.27.13
+	k8s.io/apimachinery v0.27.13
+	k8s.io/apiserver v0.27.13
+	k8s.io/client-go v0.27.13
+	k8s.io/component-base v0.27.13
 	k8s.io/klog/v2 v2.90.1
-	k8s.io/kubernetes v1.27.8
+	k8s.io/kubernetes v1.27.13
 	k8s.io/pod-security-admission v0.0.0
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491
 	sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0
@@ -102,19 +102,19 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.19.0 // indirect
-	golang.org/x/crypto v0.19.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
 	golang.org/x/oauth2 v0.13.0 // indirect
-	golang.org/x/sync v0.4.0 // indirect
-	golang.org/x/term v0.17.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/term v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.12.0 // indirect
+	golang.org/x/tools v0.16.1 // indirect
 	google.golang.org/api v0.149.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
 	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/gcfg.v1 v1.2.3 // indirect
@@ -123,49 +123,49 @@ require (
 	gopkg.in/warnings.v0 v0.1.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.0.0 // indirect
-	k8s.io/cloud-provider v0.27.8 // indirect
-	k8s.io/component-helpers v0.27.8 // indirect
-	k8s.io/controller-manager v0.27.8 // indirect
-	k8s.io/kms v0.27.8 // indirect
+	k8s.io/cloud-provider v0.27.13 // indirect
+	k8s.io/component-helpers v0.27.13 // indirect
+	k8s.io/controller-manager v0.27.13 // indirect
+	k8s.io/kms v0.27.13 // indirect
 	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
 	k8s.io/kubectl v0.0.0 // indirect
 	k8s.io/kubelet v0.0.0 // indirect
 	k8s.io/legacy-cloud-providers v0.0.0 // indirect
-	k8s.io/mount-utils v0.27.8 // indirect
+	k8s.io/mount-utils v0.27.13 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
 
 replace (
 	github.com/emicklei/go-restful => github.com/emicklei/go-restful/v3 v3.8.0
-	k8s.io/api => k8s.io/api v0.27.8
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.8
-	k8s.io/apimachinery => k8s.io/apimachinery v0.27.8
-	k8s.io/apiserver => k8s.io/apiserver v0.27.8
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.8
-	k8s.io/client-go => k8s.io/client-go v0.27.8
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.8
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.8
-	k8s.io/code-generator => k8s.io/code-generator v0.27.8
-	k8s.io/component-base => k8s.io/component-base v0.27.8
-	k8s.io/component-helpers => k8s.io/component-helpers v0.27.8
-	k8s.io/controller-manager => k8s.io/controller-manager v0.27.8
-	k8s.io/cri-api => k8s.io/cri-api v0.27.8
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.8
-	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.8
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.8
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.8
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.8
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.8
-	k8s.io/kubectl => k8s.io/kubectl v0.27.8
-	k8s.io/kubelet => k8s.io/kubelet v0.27.8
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.8
-	k8s.io/metrics => k8s.io/metrics v0.27.8
-	k8s.io/mount-utils => k8s.io/mount-utils v0.27.8
-	k8s.io/node-api => k8s.io/node-api v0.27.8
-	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.8
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.8
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.8
-	k8s.io/sample-controller => k8s.io/sample-controller v0.27.8
+	k8s.io/api => k8s.io/api v0.27.13
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.13
+	k8s.io/apimachinery => k8s.io/apimachinery v0.27.13
+	k8s.io/apiserver => k8s.io/apiserver v0.27.13
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.13
+	k8s.io/client-go => k8s.io/client-go v0.27.13
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.13
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.13
+	k8s.io/code-generator => k8s.io/code-generator v0.27.13
+	k8s.io/component-base => k8s.io/component-base v0.27.13
+	k8s.io/component-helpers => k8s.io/component-helpers v0.27.13
+	k8s.io/controller-manager => k8s.io/controller-manager v0.27.13
+	k8s.io/cri-api => k8s.io/cri-api v0.27.13
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.13
+	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.13
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.13
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.13
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.13
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.13
+	k8s.io/kubectl => k8s.io/kubectl v0.27.13
+	k8s.io/kubelet => k8s.io/kubelet v0.27.13
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.13
+	k8s.io/metrics => k8s.io/metrics v0.27.13
+	k8s.io/mount-utils => k8s.io/mount-utils v0.27.13
+	k8s.io/node-api => k8s.io/node-api v0.27.13
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.13
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.13
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.13
+	k8s.io/sample-controller => k8s.io/sample-controller v0.27.13
 )