Skip to content

Commit 0faed20

Browse files
k8s-publishing-botk8s-publishing-bot
committed
Merge pull request #117623 from skitt/intstr-fromint32-api-machinery
API machinery: use new intstr functions Kubernetes-commit: 32703dec0faa19762f3cde83cfefae981de62027
2 parents 2dff60b + 6caa44c commit 0faed20

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ require (
4343
gopkg.in/square/go-jose.v2 v2.6.0
4444
k8s.io/api v0.0.0-20230501174425-14796d1f9020
4545
k8s.io/apimachinery v0.0.0-20230501093353-d563c9729062
46-
k8s.io/client-go v0.0.0-20230501175051-741627a2eb97
46+
k8s.io/client-go v0.0.0-20230501214133-757bbef10a58
4747
k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059
4848
k8s.io/klog/v2 v2.90.1
4949
k8s.io/kms v0.0.0-20230425181524-5ea13ac087e1
@@ -126,7 +126,7 @@ require (
126126
replace (
127127
k8s.io/api => k8s.io/api v0.0.0-20230501174425-14796d1f9020
128128
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230501093353-d563c9729062
129-
k8s.io/client-go => k8s.io/client-go v0.0.0-20230501175051-741627a2eb97
129+
k8s.io/client-go => k8s.io/client-go v0.0.0-20230501214133-757bbef10a58
130130
k8s.io/component-base => k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059
131131
k8s.io/kms => k8s.io/kms v0.0.0-20230425181524-5ea13ac087e1
132132
)

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -882,8 +882,8 @@ k8s.io/api v0.0.0-20230501174425-14796d1f9020 h1:S9xIIE+YN8m+OzIH+081ybssE8ez+7W
882882
k8s.io/api v0.0.0-20230501174425-14796d1f9020/go.mod h1:Q3mFvxQWcKDcMww6VOwmdhvjHt4L2TegJLa6Q12hjGg=
883883
k8s.io/apimachinery v0.0.0-20230501093353-d563c9729062 h1:YRVK1TsKqSFL/SP2un7buT9skEyoFpQwrtzkdnOv1io=
884884
k8s.io/apimachinery v0.0.0-20230501093353-d563c9729062/go.mod h1:8pvYyRbWovK8tOF+ubfyUBX6aGREZx9m61vDDA9aDTU=
885-
k8s.io/client-go v0.0.0-20230501175051-741627a2eb97 h1:o2MXEP6kktgZw6kd7HE57bUvN1ogj9Hrh4Y+MAWBnfw=
886-
k8s.io/client-go v0.0.0-20230501175051-741627a2eb97/go.mod h1:xRN3LOJ9qzghYDdmYUANZcyn5AtgC5iFwEn/CGIKiTk=
885+
k8s.io/client-go v0.0.0-20230501214133-757bbef10a58 h1:XC1njcCQIXWfVdng7+pOG7dJJ9+7k8J5sfDe6+3Ve0c=
886+
k8s.io/client-go v0.0.0-20230501214133-757bbef10a58/go.mod h1:xRN3LOJ9qzghYDdmYUANZcyn5AtgC5iFwEn/CGIKiTk=
887887
k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059 h1:bfx0pd/KveIVnCJ2am0WyRX7zg1GExO8D6SOPrIzFng=
888888
k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059/go.mod h1:gvrfbARZnC4fi4Z2qeJ/JpwN78gHUUnlLagLv95QDyY=
889889
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=

‎pkg/util/proxy/proxy_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestResolve(t *testing.T) {
6868
Type: v1.ServiceTypeClusterIP,
6969
ClusterIP: "hit",
7070
Ports: []v1.ServicePort{
71-
{Port: 1234, TargetPort: intstr.FromInt(1234)},
71+
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
7272
},
7373
},
7474
},
@@ -87,8 +87,8 @@ func TestResolve(t *testing.T) {
8787
Type: v1.ServiceTypeClusterIP,
8888
ClusterIP: "hit",
8989
Ports: []v1.ServicePort{
90-
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
91-
{Port: 1234, TargetPort: intstr.FromInt(1234)},
90+
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
91+
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
9292
},
9393
},
9494
},
@@ -107,8 +107,8 @@ func TestResolve(t *testing.T) {
107107
Type: v1.ServiceTypeClusterIP,
108108
ClusterIP: "hit",
109109
Ports: []v1.ServicePort{
110-
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
111-
{Port: 1234, TargetPort: intstr.FromInt(1234)},
110+
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
111+
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
112112
},
113113
},
114114
},
@@ -127,8 +127,8 @@ func TestResolve(t *testing.T) {
127127
Type: v1.ServiceTypeClusterIP,
128128
ClusterIP: "hit",
129129
Ports: []v1.ServicePort{
130-
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
131-
{Port: 1234, TargetPort: intstr.FromInt(1234)},
130+
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
131+
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
132132
},
133133
},
134134
},
@@ -152,8 +152,8 @@ func TestResolve(t *testing.T) {
152152
Type: v1.ServiceTypeClusterIP,
153153
ClusterIP: "hit",
154154
Ports: []v1.ServicePort{
155-
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
156-
{Port: 1234, TargetPort: intstr.FromInt(1234)},
155+
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
156+
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
157157
},
158158
},
159159
},
@@ -196,8 +196,8 @@ func TestResolve(t *testing.T) {
196196
Type: v1.ServiceTypeLoadBalancer,
197197
ClusterIP: "lb",
198198
Ports: []v1.ServicePort{
199-
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
200-
{Port: 1234, TargetPort: intstr.FromInt(1234)},
199+
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
200+
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
201201
},
202202
},
203203
},
@@ -216,8 +216,8 @@ func TestResolve(t *testing.T) {
216216
Type: v1.ServiceTypeNodePort,
217217
ClusterIP: "np",
218218
Ports: []v1.ServicePort{
219-
{Name: "https", Port: 443, TargetPort: intstr.FromInt(1443)},
220-
{Port: 1234, TargetPort: intstr.FromInt(1234)},
219+
{Name: "https", Port: 443, TargetPort: intstr.FromInt32(1443)},
220+
{Port: 1234, TargetPort: intstr.FromInt32(1234)},
221221
},
222222
},
223223
},

0 commit comments

Comments
 (0)