Skip to content
This repository has been archived by the owner on Sep 12, 2023. It is now read-only.

GetDefaultContainerPortNumber to GetDefaultContainerPortName #41

Merged
merged 3 commits into from
Jun 12, 2019
Merged

GetDefaultContainerPortNumber to GetDefaultContainerPortName #41

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e074e2
change the port number of name
merlintang Jun 12, 2019
c83fee4
update for travis build
merlintang Jun 12, 2019
216d056
fix w.r.t comments
merlintang Jun 12, 2019
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
2 changes: 1 addition & 1 deletion job_controller/api/v1/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ type ControllerInterface interface {
GetDefaultContainerName() string

// Get the default container port number
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the comment here

GetDefaultContainerPortNumber() string
GetDefaultContainerPortName() string

// Returns if this replica type with index specified is a master role.
// MasterRole pod will have "job-role=master" set in its label
Expand Down
4 changes: 2 additions & 2 deletions job_controller/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func (jc *JobController) GetPortFromJob(spec *apiv1.ReplicaSpec) (int32, error)
if container.Name == jc.Controller.GetDefaultContainerName() {
ports := container.Ports
for _, port := range ports {
if port.Name == jc.Controller.GetDefaultContainerPortNumber(){
if port.Name == jc.Controller.GetDefaultContainerPortName(){
return port.ContainerPort, nil
}
}
Expand Down Expand Up @@ -213,7 +213,7 @@ func (jc *JobController) CreateNewService(job metav1.Object, rtype apiv1.Replica
Selector: labels,
Ports: []v1.ServicePort{
{
Name: jc.Controller.GetDefaultContainerPortNumber(),
Name: jc.Controller.GetDefaultContainerPortName(),
Port: port,
},
},
Expand Down
4 changes: 2 additions & 2 deletions job_controller/test_job_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ func (TestJobController) GetJobRoleKey() string {
return apiv1.JobRoleLabel
}

func (TestJobController) GetDefaultContainerPortNumber() string {
return "9999"
func (TestJobController) GetDefaultContainerPortName() string {
return "default-port-name"
}

func (t *TestJobController) GetJobFromInformerCache(namespace, name string) (v1.Object, error) {
Expand Down
4 changes: 2 additions & 2 deletions test_job/v1/test_job_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ func (TestJobController) GetJobRoleKey() string {
return apiv1.JobRoleLabel
}

func (TestJobController) GetDefaultContainerPortNumber() string {
return "9999"
func (TestJobController) GetDefaultContainerPortName() string {
return "default-port-name"
}

func (t *TestJobController) GetJobFromInformerCache(namespace, name string) (v1.Object, error) {
Expand Down