Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Rio
Commits
c3637d96
Unverified
Commit
c3637d96
authored
5 years ago
by
Darren Shepherd
Committed by
GitHub
5 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #193 from StrongMonkey/fix-revision
fix revision issue
parents
92826f24
787f9999
master
api-refactor
dependabot/go_modules/github.com/containerd/containerd-1.4.13
dependabot/go_modules/github.com/gogo/protobuf-1.3.2
expose_changes
fix-test2
fix2
fix_codegen
ibuildthecloud-master
ibuildthecloud-patch-1
issue-template
readme-update
refactor
v0.8.0
v0.8.0-rc3
v0.8.0-rc2
v0.8.0-rc1
v0.7.1
v0.7.1-rc2
v0.7.1-rc1
v0.7.0
v0.7.0-rc3
v0.7.0-rc2
v0.7.0-rc1
v0.6.0
v0.6.0-rc4
v0.6.0-rc3
v0.6.0-rc2
v0.6.0-rc1
v0.6.0-alpha.5
v0.6.0-alpha.4
v0.6.0-alpha.3
v0.6.0-alpha.2
v0.6.0-alpha.1
v0.5.0
v0.5.0-rc2
v0.5.0-rc1
v0.5.0-alpha.5
v0.5.0-alpha.4
v0.5.0-alpha.3
v0.5.0-alpha.2
v0.5.0-alpha.1
v0.4.0
v0.4.0-rc4
v0.4.0-rc3
v0.4.0-rc2
v0.4.0-rc1
v0.3.2
v0.3.2-rc1
v0.3.1
v0.3.1-rc1
v0.3.0
v0.3.0-rc2
v0.3.0-rc1
v0.2.0
v0.2.0-rc3
v0.2.0-rc2
v0.2.0-rc1
v0.1.1
v0.1.1-rc5
v0.1.1-rc4
v0.1.1-rc3
v0.1.1-rc2
v0.1.1-rc1
v0.1.0
v0.1.0-rc13
v0.1.0-rc12
v0.1.0-rc11
v0.1.0-rc10
v0.1.0-rc9
v0.1.0-rc8
v0.1.0-rc7
v0.1.0-rc6
v0.1.0-rc5
v0.1.0-rc4
v0.1.0-rc3
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/service/controllers/service/populate/k8sservice/service_service.go
+3
-1
...ontrollers/service/populate/k8sservice/service_service.go
with
3 additions
and
1 deletion
+3
-1
modules/service/controllers/service/populate/k8sservice/service_service.go
+
3
-
1
View file @
c3637d96
...
...
@@ -5,6 +5,7 @@ import (
"github.com/rancher/rio/modules/service/controllers/service/populate/serviceports"
riov1
"github.com/rancher/rio/pkg/apis/rio.cattle.io/v1"
"github.com/rancher/rio/pkg/constructors"
"github.com/rancher/rio/pkg/services"
"github.com/rancher/wrangler/pkg/objectset"
v1
"k8s.io/api/core/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
...
...
@@ -14,7 +15,8 @@ import (
func
serviceSelector
(
service
*
riov1
.
Service
,
os
*
objectset
.
ObjectSet
)
{
labels
:=
servicelabels
.
ServiceLabels
(
service
)
selectorLabels
:=
servicelabels
.
SelectorLabels
(
service
)
svc
:=
newServiceSelector
(
service
.
Name
,
service
.
Namespace
,
labels
,
selectorLabels
)
app
,
version
:=
services
.
AppAndVersion
(
service
)
svc
:=
newServiceSelector
(
app
+
"-"
+
version
,
service
.
Namespace
,
labels
,
selectorLabels
)
if
len
(
serviceports
.
ServiceNamedPorts
(
service
))
>
0
{
svc
.
Spec
.
Ports
=
serviceports
.
ServiceNamedPorts
(
service
)
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help