Skip to content
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.

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

Ensure loadbalancer resource #145

Merged
merged 20 commits into from Jun 7, 2017

Conversation

Projects
None yet
2 participants
@sadlil
Copy link
Contributor

commented Jun 6, 2017

Fix #123

sadlil added some commits Jun 5, 2017

Merge remote-tracking branch 'origin/master'
Conflicts:
	pkg/controller/ingress/handler.go
	pkg/controller/ingress/types.go
Merge remote-tracking branch 'remotes/origin/master' into ensure-load…
…balancer-resource

Conflicts:
	pkg/controller/ingress/handler.go
	pkg/controller/ingress/types.go
Merge remote-tracking branch 'remotes/origin/master' into ensure-load…
…balancer-resource

Conflicts:
	pkg/controller/ingress/handler.go
	pkg/controller/ingress/types.go

@sadlil sadlil added this to the 1.5.6 milestone Jun 6, 2017

@sadlil sadlil self-assigned this Jun 6, 2017

@sadlil sadlil requested a review from tamalsaha Jun 6, 2017

@@ -230,6 +230,14 @@ func (lbc *EngressController) updateLBSvc() error {
func (lbc *EngressController) UpdateTargetAnnotations(old annotation, new annotation) error {
lbc.parse()

// Check If Stats Annotations are changed.

This comment has been minimized.

Copy link
@tamalsaha

tamalsaha Jun 6, 2017

Member

I think this should not be here.

@@ -361,6 +373,10 @@ func (lbc *EngressController) createNodePortPods() error {
Name: VoyagerPrefix + lbc.Config.Name,
Namespace: lbc.Config.Namespace,
Labels: labelsFor(lbc.Config.Name),
Annotations: map[string]string{
LoadBalancerSourceType: lbc.kind,

This comment has been minimized.

Copy link
@tamalsaha

tamalsaha Jun 6, 2017

Member

How is this going to affect existing Ingress?

This comment has been minimized.

Copy link
@sadlil

sadlil Jun 7, 2017

Author Contributor

existing ingress resources will be updated if accordingly if the annotations are not found. this was fixed in commit 9d7631d

@tamalsaha tamalsaha merged commit c89ce0a into master Jun 7, 2017

@tamalsaha tamalsaha deleted the ensure-loadbalancer-resource branch Jun 7, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.