Skip to content

use public address for deployer pod environment #1226

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

Closed
pweil- wants to merge 1 commit into from
Closed

use public address for deployer pod environment #1226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pkg/cmd/server/origin/master.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,8 @@ func (c *MasterConfig) RunBuildImageChangeTriggerController() {
func (c *MasterConfig) RunDeploymentController() {
_, kclient := c.DeploymentControllerClients()
env := []api.EnvVar{
{Name: "KUBERNETES_MASTER", Value: c.MasterAddr},
{Name: "OPENSHIFT_MASTER", Value: c.MasterAddr},
{Name: "KUBERNETES_MASTER", Value: c.MasterPublicAddr},
Copy link
Contributor

@liggitt liggitt Mar 4, 2015

Choose a reason for hiding this comment

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

Doesn't that mean --master is set incorrectly? --master should be the address in-cluster things (e.g. nodes) can use to reach the master. --public-master is the address out of cluster things (e.g. browser, osc from user's desktop) can use to reach the master.

Copy link
Contributor

@liggitt liggitt Mar 4, 2015

Choose a reason for hiding this comment

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

There are cases where the public address won't be accessible from within the cluster, so I don't think just switching to that is correct.

Copy link
Author

@pweil- pweil- Mar 4, 2015

Choose a reason for hiding this comment

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

Thanks @liggitt I'll take a look at how the service is starting up. If there is a use case where public address is not accessible in the cluster then this is certainly wrong

Copy link
Contributor

@ironcladlou ironcladlou Mar 4, 2015

Choose a reason for hiding this comment

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

@liggitt That really helps clarify, thanks.

{Name: "OPENSHIFT_MASTER", Value: c.MasterPublicAddr},
}
env = append(env, clientcmd.EnvVarsFromConfig(c.DeployerClientConfig())...)

Expand Down