Merge remote-tracking branch 'origin/release-1.0'

Signed-off-by: Shriram Rajagopalan <[email protected]>

.circleci/config.yml

@@ -393,10 +393,9 @@ jobs:
           command: |
             mkdir -p /go/out/tests
             trap "go-junit-report </go/out/tests/build-log.txt > /go/out/tests/junit.xml" EXIT
-            make sync
             make localTestEnv
             set -o pipefail
-            make -k pilot-racetest mixer-racetest broker-racetest security-racetest T=-v | tee -a /go/out/tests/build-log.txt
+            make -k pilot-racetest mixer-racetest security-racetest T=-v | tee -a /go/out/tests/build-log.txt
       - <<: *recordZeroExitCodeIfTestPassed
       - <<: *recordNonzeroExitCodeIfTestFailed
       - <<: *markJobFinishesOnGCS

.gitignore

@@ -32,7 +32,6 @@ bin/protoc-min-version*
 bin/protoc-gen-docs*
 # Install generated files
 install/consul/istio.yaml
-install/eureka/istio.yaml
 install/kubernetes/addons/grafana.yaml
 install/kubernetes/addons/servicegraph.yaml
 install/kubernetes/addons/zipkin-to-stackdriver.yaml
@@ -57,8 +56,7 @@ install/kubernetes/istio-multicluster.yaml
 install/kubernetes/istio-remote.yaml
 install/kubernetes/istio-galley.yaml
 install/kubernetes/istio-auth-galley.yaml
-samples/bookinfo/consul/bookinfo.sidecars.yaml
-samples/bookinfo/eureka/bookinfo.sidecars.yaml
+samples/bookinfo/platform/consul/bookinfo.sidecars.yaml
 *.orig
 # Avoid accidental istio.VERSION changes
 istio.VERSION

Gopkg.toml

@@ -297,7 +297,10 @@ ignored = [
 
 [[constraint]]
   name = "istio.io/api"
-  branch = "master"
+  # TODO: Setting this to release-1.0 to associate istio.io/istio and istio.io/api release-1.0 branches.
+  # Once 1.0 is released, and the changes start getting merged into master, this constraint needs to be
+  # reverted back to master.
+  branch = "release-1.0"
 
 # fortio is latest tagged by default
 
@@ -358,3 +361,7 @@ ignored = [
 [[constraint]]
   name = "github.com/gogo/status"
   revision = "d60b5acac426cb52f7e28124c6aaa862d9f339f5"
+
+[[override]]
+  name = "github.com/imdario/mergo"
+  revision = "6633656539c1639d9d78127b7d47c622b5d7b6dc"

Makefile

@@ -20,7 +20,7 @@ export ISTIO_GO
 SHELL := /bin/bash
 
 # Current version, updated after a release.
-VERSION ?= 0.8-dev
+VERSION ?= 1.0-dev
 
 # locations where artifacts are stored
 ISTIO_DOCKER_HUB ?= docker.io/istio
@@ -211,16 +211,9 @@ init: check-tree check-go-version $(ISTIO_OUT)/istio_is_init
 
 # Sync target will pull from master and sync the modules. It is the first step of the
 # circleCI build, developers should call it periodically.
-sync: init git.pullmaster
+sync: init
 	mkdir -p ${OUT_DIR}/logs
 
-# Merge master. To be used in CI or by developers, assumes the
-# remote is called 'origin' (git default). Will fail on conflicts
-# Note: in a branch, this will get the latest from master. In master it has no effect.
-# This should be run after a 'git fetch' (typically done in the checkout step in CI)
-git.pullmaster:
-	git merge master
-
 # I tried to make this dependent on what I thought was the appropriate
 # lock file, but it caused the rule for that file to get run (which
 # seems to be about obtaining a new version of the 3rd party libraries).
@@ -242,7 +235,7 @@ $(ISTIO_OUT) $(ISTIO_BIN):
 
 # Used by CI to update the dependencies and generates a git diff of the vendor files against HEAD.
 depend.diff: $(ISTIO_OUT)
-	go get -u github.com/golang/dep/cmd/dep
+	curl https://raw.githubusercontent.com/golang/dep/master/install.sh | DEP_RELEASE_TAG="v0.4.1" sh
 	dep ensure
 	git diff HEAD --exit-code -- Gopkg.lock vendor > $(ISTIO_OUT)/dep.diff
 
@@ -312,6 +305,7 @@ mixs:
 $(MIXER_GO_BINS):
 	bin/gobuild.sh $@ ./mixer/cmd/$(@F)
 
+.PHONY: galley
 GALLEY_GO_BINS:=${ISTIO_OUT}/galley
 galley:
 	bin/gobuild.sh ${ISTIO_OUT}/galley ./galley/cmd/galley
@@ -370,7 +364,6 @@ ${ISTIO_OUT}/archive: istioctl-all LICENSE README.md install/updateVersion.sh re
 	cp LICENSE ${ISTIO_OUT}/archive
 	cp README.md ${ISTIO_OUT}/archive
 	cp -r tools ${ISTIO_OUT}/archive
-	cp bin/dump_kubernetes.sh ${ISTIO_OUT}/archive
 	ISTIO_RELEASE=1 install/updateVersion.sh -a "$(ISTIO_DOCKER_HUB),$(VERSION)" \
 		-P "$(ISTIO_URL)/deb" \
 		-d "${ISTIO_OUT}/archive"
@@ -399,7 +392,7 @@ JUNIT_UNIT_TEST_XML ?= $(ISTIO_OUT)/junit_unit-tests.xml
 test: | $(JUNIT_REPORT)
 	mkdir -p $(dir $(JUNIT_UNIT_TEST_XML))
 	set -o pipefail; \
-	$(MAKE) --keep-going common-test pilot-test mixer-test security-test broker-test galley-test istioctl-test \
+	$(MAKE) --keep-going common-test pilot-test mixer-test security-test galley-test istioctl-test \
 	2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_UNIT_TEST_XML))
 
 GOTEST_PARALLEL ?= '-test.parallel=4'
@@ -408,7 +401,7 @@ GOTEST_PARALLEL ?= '-test.parallel=4'
 GOTEST_P ?=
 GOSTATIC = -ldflags '-extldflags "-static"'
 
-PILOT_TEST_BINS:=${ISTIO_OUT}/pilot-test-server ${ISTIO_OUT}/pilot-test-client ${ISTIO_OUT}/pilot-test-eurekamirror
+PILOT_TEST_BINS:=${ISTIO_OUT}/pilot-test-server ${ISTIO_OUT}/pilot-test-client
 
 $(PILOT_TEST_BINS):
 	CGO_ENABLED=0 go build ${GOSTATIC} -o $@ istio.io/istio/$(subst -,/,$(@F))
@@ -445,10 +438,6 @@ mixer-test: mixs
 	# Some tests use relative path "testdata", must be run from mixer dir
 	(cd mixer; go test ${GOTEST_P} ${MIXER_TEST_T} ./...)
 
-.PHONY: broker-test
-broker-test: depend
-	go test ${T} ./broker/...
-
 .PHONY: galley-test
 galley-test: depend
 	go test ${T} ./galley/...
@@ -469,7 +458,7 @@ common-test:
 .PHONY: coverage
 
 # Run coverage tests
-coverage: pilot-coverage mixer-coverage security-coverage broker-coverage galley-coverage common-coverage istioctl-coverage
+coverage: pilot-coverage mixer-coverage security-coverage galley-coverage common-coverage istioctl-coverage
 
 .PHONY: pilot-coverage
 pilot-coverage:
@@ -483,10 +472,6 @@ istioctl-coverage:
 mixer-coverage:
 	bin/codecov.sh mixer
 
-.PHONY: broker-coverage
-broker-coverage:
-	bin/codecov.sh broker
-
 .PHONY: galley-coverage
 galley-coverage:
 	bin/codecov.sh galley
@@ -507,7 +492,7 @@ common-coverage:
 .PHONY: racetest
 
 # Run race tests
-racetest: pilot-racetest mixer-racetest security-racetest broker-racetest galley-test common-racetest istioctl-racetest
+racetest: pilot-racetest mixer-racetest security-racetest galley-test common-racetest istioctl-racetest
 
 .PHONY: pilot-racetest
 pilot-racetest: pilot-agent
@@ -522,10 +507,6 @@ mixer-racetest: mixs
 	# Some tests use relative path "testdata", must be run from mixer dir
 	(cd mixer; RACE_TEST=true go test ${T} -race ${GOTEST_PARALLEL} ./...)
 
-.PHONY: broker-racetest
-broker-racetest: depend
-	RACE_TEST=true go test ${T} -race ./broker/...
-
 .PHONY: galley-racetest
 galley-racetest: depend
 	RACE_TEST=true go test ${T} -race ./galley/...
@@ -627,7 +608,6 @@ generate_yaml_new:
 
 # files generated by the default invocation of updateVersion.sh
 FILES_TO_CLEAN+=install/consul/istio.yaml \
-                install/eureka/istio.yaml \
                 install/kubernetes/addons/grafana.yaml \
                 install/kubernetes/addons/servicegraph.yaml \
                 install/kubernetes/addons/zipkin-to-stackdriver.yaml \
@@ -638,8 +618,7 @@ FILES_TO_CLEAN+=install/consul/istio.yaml \
                 install/kubernetes/istio-one-namespace-auth.yaml \
                 install/kubernetes/istio-one-namespace.yaml \
                 install/kubernetes/istio.yaml \
-                samples/bookinfo/consul/bookinfo.sidecars.yaml \
-                samples/bookinfo/eureka/bookinfo.sidecars.yaml
+                samples/bookinfo/platform/consul/bookinfo.sidecars.yaml \
 
 #-----------------------------------------------------------------------------
 # Target: environment and tools

README.md

@@ -53,9 +53,7 @@ Istio is composed of these components:
 
 - **Node Agent** - A per-node component responsible for certificate issuance and rotation.
 
-- **Broker** - A component implementing the [Open Service Broker API](https://github.com/openservicebrokerapi/servicebroker) for Istio-based services. (Under development)
-
-Istio currently supports Kubernetes, Consul, and Eureka-based environments. We plan support for additional platforms such as
+Istio currently supports Kubernetes and Consul-based environments. We plan support for additional platforms such as
 Cloud Foundry, and Mesos in the near future.
 
 ## Repositories
@@ -80,8 +78,6 @@ contains code to enforce various policies for traffic passing through the
 proxies, and collect telemetry data from proxies and services. There
 are plugins for interfacing with various cloud platforms, policy
 management services, and monitoring services.
-  - [broker](broker/). This directory
-contains code for Istio's implementation of the Open Service Broker API.
 
 - [istio/api](https://github.com/istio/api). This repository defines
 component-level APIs and common configuration formats for the Istio platform.