add controller target in makefile. (istio#307)

* add controller target in makefile.

* apply comments.

* Cleanup build

* Docker build fixes

.gitignore

@@ -28,4 +28,5 @@ build/_output/
 .mesh-cli.log
 #mandiff output
 out/
+build/out/
 data/charts/

Makefile.core.mk

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+TAG ?= latest
+
 pwd := $(shell pwd)
 
 # make targets
@@ -39,7 +41,6 @@ update-charts: installer.sha
 
 clean-charts:
 	@rm -fr data/charts
-
 # make target dependencies
 vfsgen: data/ update-charts
 	go generate ./...
@@ -63,6 +64,21 @@ mesh: vfsgen
 	go build -o $(GOPATH)/bin/mesh ./cmd/mesh.go
 	GOARCH=$(TARGET_ARCH) GOOS=$(TARGET_OS) go build -o /work/mesh ./cmd/mesh.go
 
+# NOTE: docker targets only work with local builds.
+
+controller: vfsgen
+	go build -o $(GOPATH)/bin/istio-operator ./cmd/manager
+
+docker: controller
+	mkdir -p build/out
+	cp $(GOPATH)/bin/istio-operator build/out/.
+	docker build -t $(HUB)/operator:$(TAG) -f build/Dockerfile .
+
+docker.push:
+	docker push $(HUB)/operator:$(TAG)
+
+docker.all: docker docker.push
+
 update-goldens:
 	export REFRESH_GOLDEN=true
 	@go test ./cmd/mesh/...
@@ -87,7 +103,6 @@ protoc_gen_docs_plugin := --docs_out=warnings=true,mode=html_fragment_with_front
 protoc_gen_k8s_support_plugins := --jsonshim_out=$(gogo_mapping):$(out_path) --deepcopy_out=$(gogo_mapping):$(out_path)
 
 ########################
-
 types_v1alpha2_path := pkg/apis/istio/v1alpha2
 types_v1alpha2_protos := $(wildcard $(types_v1alpha2_path)/*.proto)
 types_v1alpha2_pb_gos := $(types_v1alpha2_protos:.proto=.pb.go)

build/Dockerfile

@@ -5,8 +5,7 @@ ENV OPERATOR=/usr/local/bin/istio-operator \
     USER_NAME=istio-operator
 
 # install operator binary
-COPY build/_output/bin/istio-operator ${OPERATOR}
-
+COPY build/out/istio-operator /usr/local/bin/.
 COPY build/bin /usr/local/bin
 RUN  /usr/local/bin/user_setup
 

deploy/operator.yaml

@@ -15,8 +15,7 @@ spec:
       serviceAccountName: istio-operator
       containers:
         - name: istio-operator
-          # Replace this with the built image name
-          image: REPLACE_IMAGE
+          image: docker.io/istio/controller
           command:
           - istio-operator
           - server