remove http injection endpoint (istio#2209)

ayj · web-flow · commit c421b0bc9978 · 2017-12-15T16:02:28.000-08:00
diff --git a/pilot/cmd/pilot-discovery/server/BUILD b/pilot/cmd/pilot-discovery/server/BUILD
@@ -30,7 +30,6 @@ go_library(
         "@com_github_golang_glog//:go_default_library",
         "@com_github_golang_protobuf//ptypes/duration:go_default_library",
         "@com_github_hashicorp_go_multierror//:go_default_library",
-        "@com_github_prometheus_client_golang//prometheus:go_default_library",
         "@com_github_prometheus_client_golang//prometheus/promhttp:go_default_library",
         "@io_istio_api//mesh/v1alpha1:go_default_library",
         "@io_k8s_client_go//kubernetes:go_default_library",
diff --git a/pilot/cmd/sidecar-initializer/main.go b/pilot/cmd/sidecar-initializer/main.go
@@ -65,10 +65,6 @@ func getRootCmd() *cobra.Command {
 
 			stop := make(chan struct{})
 
-			if flags.port != 0 {
-				server := inject.NewHTTPServer(flags.port, config)
-				go server.Run(stop)
-			}
 			go initializer.Run(stop)
 
 			cmd.WaitSignal(stop)
@@ -84,8 +80,6 @@ func getRootCmd() *cobra.Command {
 		"Name of initializer configuration ConfigMap")
 	rootCmd.PersistentFlags().StringVar(&flags.namespace, "namespace", v1.NamespaceDefault, // TODO istio-system?
 		"Namespace of initializer configuration ConfigMap")
-	rootCmd.PersistentFlags().IntVar(&flags.port, "port", 8083,
-		"HTTP-based initializer service port. Zero value disables HTTP endpoint")
 
 	cmd.AddFlags(rootCmd)
 
diff --git a/pilot/platform/kube/inject/BUILD b/pilot/platform/kube/inject/BUILD
@@ -4,7 +4,6 @@ go_library(
     name = "go_default_library",
     srcs = [
         "configmap.go",
-        "http.go",
         "initializer.go",
         "inject.go",
     ],
@@ -14,7 +13,6 @@ go_library(
         "//pilot/proxy:go_default_library",
         "//pilot/tools/version:go_default_library",
         "@com_github_davecgh_go_spew//spew:go_default_library",
-        "@com_github_emicklei_go_restful//:go_default_library",
         "@com_github_ghodss_yaml//:go_default_library",
         "@com_github_golang_glog//:go_default_library",
         "@com_github_golang_protobuf//ptypes:go_default_library",
@@ -47,7 +45,6 @@ go_test(
     name = "go_default_test",
     size = "small",
     srcs = [
-        "http_test.go",
         "initializer_test.go",
         "inject_test.go",
     ],
@@ -58,7 +55,6 @@ go_test(
         "//pilot/proxy:go_default_library",
         "//pilot/test/util:go_default_library",
         "//pilot/tools/version:go_default_library",
-        "@com_github_emicklei_go_restful//:go_default_library",
         "@com_github_ghodss_yaml//:go_default_library",
         "@io_istio_api//mesh/v1alpha1:go_default_library",
         "@io_k8s_api//core/v1:go_default_library",
diff --git a/pilot/platform/kube/inject/http.go b/pilot/platform/kube/inject/http.go
diff --git a/pilot/platform/kube/inject/http_test.go b/pilot/platform/kube/inject/http_test.go
diff --git a/pilot/test/integration/testdata/initializer.yaml.tmpl b/pilot/test/integration/testdata/initializer.yaml.tmpl
@@ -32,7 +32,6 @@ spec:
           image: {{.Hub}}/sidecar_initializer:{{.Tag}}
           imagePullPolicy: IfNotPresent
           args:
-            - --port=8083
             - --namespace={{.IstioNamespace}}
             - -v=2
           volumeMounts:
