Skip to content

Commit

Permalink
Temporarily disable --tls optional
Browse files Browse the repository at this point in the history
Signed-off-by: Alejandro Pedraza <[email protected]>
  • Loading branch information
alpeb committed Mar 12, 2019
1 parent 195d2f2 commit 497e284
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions cli/cmd/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package cmd

import (
"bytes"
"errors"
"fmt"
"io"
"io/ioutil"
Expand Down Expand Up @@ -153,6 +154,11 @@ func validateAndBuildConfig(options *installOptions) (*installConfig, error) {
return nil, err
}

// TODO: remove this when the Identity work gets merged
if options.enableTLS() {
return nil, errors.New("--tls optional is temporarily disallowed")
}

return &installConfig{
Namespace: controlPlaneNamespace,
ControllerImage: fmt.Sprintf("%s/controller:%s", options.dockerRegistry, options.linkerdVersion),
Expand Down

0 comments on commit 497e284

Please sign in to comment.