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

Merge pull request #117623 from skitt/intstr-fromint32-api-machinery 

API machinery: use new intstr functions

Kubernetes-commit: 32703dec0faa19762f3cde83cfefae981de62027
This commit is contained in:
Kubernetes Publisher 2023-05-01 11:18:07 -07:00
parent 2dff60bb4d 6caa44cc84
commit 0faed203d1
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -43,7 +43,7 @@ require (
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20230501174425-14796d1f9020
k8s.io/apimachinery v0.0.0-20230501093353-d563c9729062
k8s.io/client-go v0.0.0-20230501175051-741627a2eb97
k8s.io/client-go v0.0.0-20230501214133-757bbef10a58
k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059
k8s.io/klog/v2 v2.90.1
k8s.io/kms v0.0.0-20230425181524-5ea13ac087e1
@ -126,7 +126,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20230501174425-14796d1f9020
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230501093353-d563c9729062
k8s.io/client-go => k8s.io/client-go v0.0.0-20230501175051-741627a2eb97
k8s.io/client-go => k8s.io/client-go v0.0.0-20230501214133-757bbef10a58
k8s.io/component-base => k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059
k8s.io/kms => k8s.io/kms v0.0.0-20230425181524-5ea13ac087e1
)

4
go.sum
View File

@ -882,8 +882,8 @@ k8s.io/api v0.0.0-20230501174425-14796d1f9020 h1:S9xIIE+YN8m+OzIH+081ybssE8ez+7W
k8s.io/api v0.0.0-20230501174425-14796d1f9020/go.mod h1:Q3mFvxQWcKDcMww6VOwmdhvjHt4L2TegJLa6Q12hjGg=
k8s.io/apimachinery v0.0.0-20230501093353-d563c9729062 h1:YRVK1TsKqSFL/SP2un7buT9skEyoFpQwrtzkdnOv1io=
k8s.io/apimachinery v0.0.0-20230501093353-d563c9729062/go.mod h1:8pvYyRbWovK8tOF+ubfyUBX6aGREZx9m61vDDA9aDTU=
k8s.io/client-go v0.0.0-20230501175051-741627a2eb97 h1:o2MXEP6kktgZw6kd7HE57bUvN1ogj9Hrh4Y+MAWBnfw=
k8s.io/client-go v0.0.0-20230501175051-741627a2eb97/go.mod h1:xRN3LOJ9qzghYDdmYUANZcyn5AtgC5iFwEn/CGIKiTk=
k8s.io/client-go v0.0.0-20230501214133-757bbef10a58 h1:XC1njcCQIXWfVdng7+pOG7dJJ9+7k8J5sfDe6+3Ve0c=
k8s.io/client-go v0.0.0-20230501214133-757bbef10a58/go.mod h1:xRN3LOJ9qzghYDdmYUANZcyn5AtgC5iFwEn/CGIKiTk=
k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059 h1:bfx0pd/KveIVnCJ2am0WyRX7zg1GExO8D6SOPrIzFng=
k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059/go.mod h1:gvrfbARZnC4fi4Z2qeJ/JpwN78gHUUnlLagLv95QDyY=
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=

26
pkg/util/proxy/proxy_test.go
View File

@ -68,7 +68,7 @@ func TestResolve(t *testing.T) {
Type: v1.ServiceTypeClusterIP,
ClusterIP: "hit",
Ports: []v1.ServicePort{
{Port: 1234, TargetPort: intstr.FromInt(1234)},
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
},
},
},
@ -87,8 +87,8 @@ func TestResolve(t *testing.T) {
Type: v1.ServiceTypeClusterIP,
ClusterIP: "hit",
Ports: []v1.ServicePort{
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
{Port: 1234, TargetPort: intstr.FromInt(1234)},
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
},
},
},
@ -107,8 +107,8 @@ func TestResolve(t *testing.T) {
Type: v1.ServiceTypeClusterIP,
ClusterIP: "hit",
Ports: []v1.ServicePort{
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
{Port: 1234, TargetPort: intstr.FromInt(1234)},
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
},
},
},
@ -127,8 +127,8 @@ func TestResolve(t *testing.T) {
Type: v1.ServiceTypeClusterIP,
ClusterIP: "hit",
Ports: []v1.ServicePort{
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
{Port: 1234, TargetPort: intstr.FromInt(1234)},
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
},
},
},
@ -152,8 +152,8 @@ func TestResolve(t *testing.T) {
Type: v1.ServiceTypeClusterIP,
ClusterIP: "hit",
Ports: []v1.ServicePort{
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
{Port: 1234, TargetPort: intstr.FromInt(1234)},
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
},
},
},
@ -196,8 +196,8 @@ func TestResolve(t *testing.T) {
Type: v1.ServiceTypeLoadBalancer,
ClusterIP: "lb",
Ports: []v1.ServicePort{
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
{Port: 1234, TargetPort: intstr.FromInt(1234)},
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
},
},
},
@ -216,8 +216,8 @@ func TestResolve(t *testing.T) {
Type: v1.ServiceTypeNodePort,
ClusterIP: "np",
Ports: []v1.ServicePort{
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
{Port: 1234, TargetPort: intstr.FromInt(1234)},
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
},
},
},