github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-26 04:36:00 +00:00
Code Issues Projects Releases Wiki Activity

Refactor IntOrString into a new pkg

Browse Source 
pkg/util/intstr is a cleaner encapsulation for this type and supporting
functions.  No behavioral change.
This commit is contained in:
Tim Hockin
2015-11-09 22:28:45 -08:00
parent 3a07af0b28
commit ba383bcfeb
63 changed files with 676 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/pods.go
View File

@@ -35,6 +35,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/intstr"
"k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/pkg/watch"
@@ -287,7 +288,7 @@ var _ = Describe("Pods", func() {
Handler: api.Handler{
HTTPGet: &api.HTTPGetAction{
Path: "/index.html",
Port: util.NewIntOrStringFromInt(8080),
Port: intstr.FromInt(8080),
},
},
InitialDelaySeconds: 30,
@@ -396,7 +397,7 @@ var _ = Describe("Pods", func() {
Handler: api.Handler{
HTTPGet: &api.HTTPGetAction{
Path: "/index.html",
Port: util.NewIntOrStringFromInt(8080),
Port: intstr.FromInt(8080),
},
},
InitialDelaySeconds: 30,
@@ -498,7 +499,7 @@ var _ = Describe("Pods", func() {
Spec: api.ServiceSpec{
Ports: []api.ServicePort{{
Port: 8765,
TargetPort: util.NewIntOrStringFromInt(8080),
TargetPort: intstr.FromInt(8080),
}},
Selector: map[string]string{
"name": serverName,
@@ -611,7 +612,7 @@ var _ = Describe("Pods", func() {
Handler: api.Handler{
HTTPGet: &api.HTTPGetAction{
Path: "/healthz",
Port: util.NewIntOrStringFromInt(8080),
Port: intstr.FromInt(8080),
},
},
InitialDelaySeconds: 15,
@@ -639,7 +640,7 @@ var _ = Describe("Pods", func() {
Handler: api.Handler{
HTTPGet: &api.HTTPGetAction{
Path: "/healthz",
Port: util.NewIntOrStringFromInt(8080),
Port: intstr.FromInt(8080),
},
},
InitialDelaySeconds: 5,
@@ -673,7 +674,7 @@ var _ = Describe("Pods", func() {
Handler: api.Handler{
HTTPGet: &api.HTTPGetAction{
Path: "/read",
Port: util.NewIntOrStringFromInt(8080),
Port: intstr.FromInt(8080),
},
},
InitialDelaySeconds: 15,