Skip to content

expose: Set route port #5067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 2 commits into from
Oct 21, 2015
Merged

expose: Set route port #5067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3da802a
UPSTREAM: 15461: expose: Enable exposing multiport objects
0xmichalis Oct 12, 2015
315ba7b
expose: Set route port
0xmichalis Oct 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/expose.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 55 additions & 23 deletions Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/service.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

101 changes: 101 additions & 0 deletions Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/service_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions hack/util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,3 +774,22 @@ os::util::sed() {
sed -i'' $@
fi
}

os::util::get_object_assert() {
local object=$1
local request=$2
local expected=$3

res=$(eval oc get $object -o go-template=\"$request\")

if [[ "$res" =~ ^$expected$ ]]; then
echo "Successful get $object $request: $res"
return 0
else
echo "FAIL!"
echo "Get $object $request"
echo " Expected: $expected"
echo " Got: $res"
return 1
fi
}
22 changes: 22 additions & 0 deletions pkg/route/generator/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ package generator

import (
"fmt"
"strconv"
"strings"

kapi "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"

"github.com/openshift/origin/pkg/route/api"
)
Expand All @@ -21,6 +24,8 @@ func (RouteGenerator) ParamNames() []kubectl.GeneratorParam {
return []kubectl.GeneratorParam{
{"labels", false},
{"default-name", true},
{"port", false},
{"ports", false},
{"name", false},
{"hostname", false},
}
Expand Down Expand Up @@ -58,6 +63,17 @@ func (RouteGenerator) Generate(genericParams map[string]interface{}) (runtime.Ob
}
}

var portString string
portString, found = params["port"]
if !found || len(portString) == 0 {
portString = strings.Split(params["ports"], ",")[0]
}

port, err := strconv.ParseInt(portString, 10, 0)
if err != nil {
return nil, err
}

return &api.Route{
ObjectMeta: kapi.ObjectMeta{
Name: name,
Expand All @@ -68,6 +84,12 @@ func (RouteGenerator) Generate(genericParams map[string]interface{}) (runtime.Ob
To: kapi.ObjectReference{
Name: params["default-name"],
},
Port: &api.RoutePort{
TargetPort: util.IntOrString{
Kind: util.IntstrInt,
IntVal: int(port),
},
},
},
}, nil
}
Loading