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.

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

Fix 2 bugs we found in our deployment #8

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix 2 bugs we found in our deployment #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c647600
Fix mesos.Credential.secret type mismatch
accelazh Jan 21, 2016
a61d38c
Enable setting published address
accelazh Jan 21, 2016
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
19 changes: 13 additions & 6 deletions scheduler/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ var (
etcdUrl = flag.String("etcd_url", "", "CloudFoundry ETCD URL")
auctionStrategy = flag.String("auction_strategy", "binpack", "<binpadk|spread> Strategy when scheduling auctions")
executorImage = flag.String("executor_image", "jianhuiz/diego-cell", "Docker image of the mesos diego executor (executor + diego cell)")
address = flag.String("address", "127.0.0.1", "Binding address for artifact server")
bindingAddress = flag.String("binding_address", "127.0.0.1", "Which address to bind and listen for mesos master")
publishedAddress = flag.String("published_address", "", "Which address mesos master connects to this scheduler. Defaults to binding address.")
authProvider = flag.String("mesos_authentication_provider", sasl.ProviderName,
fmt.Sprintf("Authentication provider to use, default is SASL that supports mechanisms: %+v", mech.ListSupported()))
master = flag.String("master", "127.0.0.1:5050", "Master address <ip:port>")
Expand All @@ -41,27 +42,33 @@ func InitializeScheduler() (*DiegoScheduler, *sched.MesosSchedulerDriver) {
cred := (*mesos.Credential)(nil)
if *mesosAuthPrincipal != "" {
fwinfo.Principal = proto.String(*mesosAuthPrincipal)
secret, err := ioutil.ReadFile(*mesosAuthSecretFile)
secret_bytes, err := ioutil.ReadFile(*mesosAuthSecretFile)
secret := string(secret_bytes[:])
if err != nil {
log.Fatal(err)
}
cred = &mesos.Credential{
Principal: proto.String(*mesosAuthPrincipal),
Secret: secret,
Secret: &secret,
}
}
bindingAddress := parseIP(*address)
bindingAddressParsed := parseIP(*bindingAddress)
publishedAddressParsed := bindingAddressParsed
if *publishedAddress != "" {
publishedAddressParsed = parseIP(*publishedAddress)
}

digoScheduler := NewDiegoScheduler(exec)
config := sched.DriverConfig{
Scheduler: digoScheduler,
Framework: fwinfo,
Master: *master,
Credential: cred,
BindingAddress: bindingAddress,
BindingAddress: bindingAddressParsed,
PublishedAddress: publishedAddressParsed,
WithAuthContext: func(ctx context.Context) context.Context {
ctx = auth.WithLoginProvider(ctx, *authProvider)
ctx = sasl.WithBindingAddress(ctx, bindingAddress)
ctx = sasl.WithBindingAddress(ctx, bindingAddressParsed)
return ctx
},
}
Expand Down