From 497e2843d8a505fd3dca782fa068d5f0fc9f45b5 Mon Sep 17 00:00:00 2001
From: Alejandro Pedraza <alejandro@buoyant.io>
Date: Tue, 12 Mar 2019 16:38:48 -0500
Subject: [PATCH] Temporarily disable --tls optional

Signed-off-by: Alejandro Pedraza <alejandro@buoyant.io>
---
 cli/cmd/install.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cli/cmd/install.go b/cli/cmd/install.go
index aae77e17ef052..509e21eb403d3 100644
--- a/cli/cmd/install.go
+++ b/cli/cmd/install.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -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),