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

Merge pull request #119835 from liggitt/mitigate-aggregated-discovery-npe 

Avoid returning nil responseKind in v1beta1 aggregated discovery

Kubernetes-commit: 3d941afece97b284c764e5320cc8c80b0e88cba8
This commit is contained in:
Kubernetes Publisher 2023-08-09 15:37:30 -07:00
parent 1edd7d6157
commit e7a7329b64
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
go.mod
View File

@ -41,9 +41,9 @@ require (
google.golang.org/protobuf v1.30.0 google.golang.org/protobuf v1.30.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/square/go-jose.v2 v2.6.0 gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20230807202504-d11dea4516ea k8s.io/api v0.0.0-20230809223730-4dda39f3e913
k8s.io/apimachinery v0.0.0-20230807201405-8071e5f05ff1 k8s.io/apimachinery v0.0.0-20230807201405-8071e5f05ff1
k8s.io/client-go v0.0.0-20230807204204-49410bfbbcf9 k8s.io/client-go v0.0.0-20230810004921-04dcae2ee350
k8s.io/component-base v0.0.0-20230807211050-31137ad9f7f2 k8s.io/component-base v0.0.0-20230807211050-31137ad9f7f2
k8s.io/klog/v2 v2.100.1 k8s.io/klog/v2 v2.100.1
k8s.io/kms v0.0.0-20230807211544-e54c40adc2b2 k8s.io/kms v0.0.0-20230807211544-e54c40adc2b2
@ -126,9 +126,9 @@ require (
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20230807202504-d11dea4516ea k8s.io/api => k8s.io/api v0.0.0-20230809223730-4dda39f3e913
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230807201405-8071e5f05ff1 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230807201405-8071e5f05ff1
k8s.io/client-go => k8s.io/client-go v0.0.0-20230807204204-49410bfbbcf9 k8s.io/client-go => k8s.io/client-go v0.0.0-20230810004921-04dcae2ee350
k8s.io/component-base => k8s.io/component-base v0.0.0-20230807211050-31137ad9f7f2 k8s.io/component-base => k8s.io/component-base v0.0.0-20230807211050-31137ad9f7f2
k8s.io/kms => k8s.io/kms v0.0.0-20230807211544-e54c40adc2b2 k8s.io/kms => k8s.io/kms v0.0.0-20230807211544-e54c40adc2b2
) )

8
go.sum
View File

@ -670,12 +670,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20230807202504-d11dea4516ea h1:1IjoJXclbOUWuIkoxE1+p/7hQvNqXiTnAikqG+h+B54= k8s.io/api v0.0.0-20230809223730-4dda39f3e913 h1:VUk+of77u2lKASQpkRbZfddgfweb0aKSBdp7slZMzpw=
k8s.io/api v0.0.0-20230807202504-d11dea4516ea/go.mod h1:RFi7MZgMNqcWc0azfutkpPR/OdHWZjnTAwdFHTKjAUQ= k8s.io/api v0.0.0-20230809223730-4dda39f3e913/go.mod h1:RFi7MZgMNqcWc0azfutkpPR/OdHWZjnTAwdFHTKjAUQ=
k8s.io/apimachinery v0.0.0-20230807201405-8071e5f05ff1 h1:NElIwKgvUTGJ2/PZEctXR9JmNzUbb8q38ojfC5guWeU= k8s.io/apimachinery v0.0.0-20230807201405-8071e5f05ff1 h1:NElIwKgvUTGJ2/PZEctXR9JmNzUbb8q38ojfC5guWeU=
k8s.io/apimachinery v0.0.0-20230807201405-8071e5f05ff1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= k8s.io/apimachinery v0.0.0-20230807201405-8071e5f05ff1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw=
k8s.io/client-go v0.0.0-20230807204204-49410bfbbcf9 h1:/wXosf3IlbuvLQQBDkBY+lSOmJGaTB5931MVjn3Zq5A= k8s.io/client-go v0.0.0-20230810004921-04dcae2ee350 h1:YxD3Jm81pq/CeGaC9mW9BvTu8bwzhdZKhTitY2Y2tSI=
k8s.io/client-go v0.0.0-20230807204204-49410bfbbcf9/go.mod h1:NbnWu9sTxFULr211okLOk4jiLYAyWn+kFzXmCLu2pK4= k8s.io/client-go v0.0.0-20230810004921-04dcae2ee350/go.mod h1:9Fxsha/DQNEBTbniVmfwXCkSlR+Ns6YmNa8aneG0dnI=
k8s.io/component-base v0.0.0-20230807211050-31137ad9f7f2 h1:bgkLpsQhIRm8Rd6h9V/n50sN63k6sEzX+Q8nCpZCCX4= k8s.io/component-base v0.0.0-20230807211050-31137ad9f7f2 h1:bgkLpsQhIRm8Rd6h9V/n50sN63k6sEzX+Q8nCpZCCX4=
k8s.io/component-base v0.0.0-20230807211050-31137ad9f7f2/go.mod h1:wjy+fowSTnR9NfN23CZuwDq+yF+viZTN5nbGbXcOYBM= k8s.io/component-base v0.0.0-20230807211050-31137ad9f7f2/go.mod h1:wjy+fowSTnR9NfN23CZuwDq+yF+viZTN5nbGbXcOYBM=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=