Merge pull request istio#10843 from hklai/1.1-master

Merge release-1.1 into master

.circleci/config.yml

@@ -236,7 +236,7 @@ jobs:
               # Should only happen when re-running a job, and the workspace is gone
               time make build test-bins
             fi
-            make docker.all generate_yaml
+            make docker.all generate_e2e_test_yaml
       - run: bin/testEnvRootMinikube.sh wait
       - run: docker images
       - run:
@@ -272,7 +272,7 @@ jobs:
               # Should only happen when re-running a job, and the workspace is gone
               time make build test-bins
             fi
-            make docker.all generate_yaml
+            make docker.all generate_e2e_test_yaml
       - run: bin/testEnvRootMinikube.sh wait
       - run: docker images
       - run:
@@ -694,7 +694,7 @@ jobs:
 
   shellcheck:
     docker:
-      - image: koalaman/shellcheck-alpine:v0.5.0
+      - image: koalaman/shellcheck-alpine:v0.6.0
     steps:
       - checkout
       - run:
@@ -875,6 +875,9 @@ workflows:
       - e2e-simple:
           requires:
             - build
+      - e2e-dashboard:
+          requires:
+            - build
       - racetest:
           requires:
             - test
@@ -890,3 +893,7 @@ workflows:
       - test-integration-local:
           requires:
             - build
+      - test-integration-kubernetes:
+          requires:
+            - build
+

.codecov.yml

@@ -3,6 +3,8 @@ coverage:
   round: up
   range: 60..99
   ignore:
+    - "mixer/test"
+    - "mixer/template"
     - "**/*.pb.go" # Auto-generated proto files
     - "tests/" # Test infrastructure coverage does not affect core coverage
     - "**/test/*.go"

.gitignore

@@ -56,6 +56,8 @@ install/kubernetes/istio-multicluster.yaml
 install/kubernetes/istio-remote.yaml
 install/kubernetes/istio-mcp.yaml
 install/kubernetes/istio-auth-mcp.yaml
+install/kubernetes/helm/istio/requirements.lock
+install/kubernetes/helm/istio-remote/requirements.lock
 samples/bookinfo/platform/consul/bookinfo.sidecars.yaml
 *.orig
 # Avoid accidental istio.VERSION changes
@@ -65,3 +67,5 @@ tests/integration/component/proxy/envoy.conf
 # Certs generated by testing
 security/cmd/node_agent/na/cert_file
 security/cmd/node_agent/na/pkey
+# Test artifacts
+tests/e2e/local/minikube/docker-machine-driver-hyperkit

Gopkg.toml

@@ -219,7 +219,7 @@ ignored = [
 
 [[constraint]]
   name = "github.com/prometheus/client_golang"
-  version = "0.9.0"
+  version = "0.9.2"
 
 [[constraint]]
   branch = "master"

Makefile

@@ -241,16 +241,8 @@ check-tree:
 init: check-tree check-go-version $(ISTIO_OUT)/istio_is_init
 	mkdir -p ${OUT_DIR}/logs
 
-# 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
-
-# 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
+# Sync is the same as init in release branch. In master this pulls from master.
+sync: init
 
 # 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
@@ -642,17 +634,29 @@ helm-repo-add:
 # create istio-remote.yaml
 istio-remote.yaml: $(HELM) $(HOME)/.helm helm-repo-add
 	cat install/kubernetes/namespace.yaml > install/kubernetes/$@
+	cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/$@
 	$(HELM) dep update --skip-refresh install/kubernetes/helm/istio-remote
 	$(HELM) template --name=istio --namespace=istio-system \
 		--set istio_cni.enabled=${ENABLE_ISTIO_CNI} \
 		${EXTRA_HELM_SETTINGS} \
 		install/kubernetes/helm/istio-remote >> install/kubernetes/$@
 
+# create istio-remote.yaml
+istio-init.yaml: $(HELM) $(HOME)/.helm helm-repo-add
+	cat install/kubernetes/namespace.yaml > install/kubernetes/$@
+	cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/$@
+	$(HELM) dep update --skip-refresh install/kubernetes/helm/istio-init
+	$(HELM) template --name=istio --namespace=istio-system \
+		--set global.tag=${TAG} \
+		--set global.hub=${HUB} \
+		install/kubernetes/helm/istio-init >> install/kubernetes/$@
+
 # creates istio.yaml istio-auth.yaml istio-one-namespace.yaml istio-one-namespace-auth.yaml
 # Ensure that values-$filename is present in install/kubernetes/helm/istio
 isti%.yaml: $(HELM) $(HOME)/.helm helm-repo-add
 	$(HELM) dep update --skip-refresh install/kubernetes/helm/istio
 	cat install/kubernetes/namespace.yaml > install/kubernetes/$@
+	cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/$@
 	$(HELM) template --set global.tag=${TAG} \
 		--name=istio \
 		--namespace=istio-system \
@@ -667,6 +671,7 @@ generate_yaml: $(HELM) $(HOME)/.helm helm-repo-add
 	$(HELM) dep update --skip-refresh install/kubernetes/helm/istio
 	./install/updateVersion.sh -a ${HUB},${TAG} >/dev/null 2>&1
 	cat install/kubernetes/namespace.yaml > install/kubernetes/istio.yaml
+	cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/istio.yaml
 	$(HELM) template --set global.tag=${TAG} \
 		--name=istio \
 		--namespace=istio-system \
@@ -678,6 +683,7 @@ generate_yaml: $(HELM) $(HOME)/.helm helm-repo-add
 		install/kubernetes/helm/istio >> install/kubernetes/istio.yaml
 
 	cat install/kubernetes/namespace.yaml > install/kubernetes/istio-auth.yaml
+	cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/istio-auth.yaml
 	$(HELM) template --set global.tag=${TAG} \
 		--name=istio \
 		--namespace=istio-system \
@@ -694,19 +700,14 @@ generate_yaml_coredump: export ENABLE_COREDUMP=true
 generate_yaml_coredump:
 	$(MAKE) generate_yaml
 
-# Generate the install files, using istioctl.
-# TODO: make sure they match, pass all tests.
-# TODO:
-generate_yaml_new: $(HELM) $(HOME)/.helm helm-repo-add
-	$(HELM) init --client-only
-	$(HELM) dep update --skip-refresh install/kubernetes/helm/istio
-	./install/updateVersion.sh -a ${HUB},${TAG} >/dev/null 2>&1
-	(cd install/kubernetes/helm/istio; ${ISTIO_OUT}/istioctl gen-deploy -o yaml --values values.yaml)
-
+# TODO(sdake) All this copy and paste needs to go.  This is easy to wrap up in
+#             isti%.yaml macro with value files per test scenario.  Will handle
+#             as a followup PR.
 generate_e2e_test_yaml: $(HELM) $(HOME)/.helm helm-repo-add
 	$(HELM) dep update --skip-refresh install/kubernetes/helm/istio
 	./install/updateVersion.sh -a ${HUB},${TAG} >/dev/null 2>&1
 	cat install/kubernetes/namespace.yaml > install/kubernetes/istio.yaml
+	cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/istio.yaml
 	$(HELM) template --set global.tag=${TAG} \
 		--name=istio \
 		--namespace=istio-system \
@@ -721,6 +722,7 @@ generate_e2e_test_yaml: $(HELM) $(HOME)/.helm helm-repo-add
 		install/kubernetes/helm/istio >> install/kubernetes/istio.yaml
 
 	cat install/kubernetes/namespace.yaml > install/kubernetes/istio-auth.yaml
+	cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/istio-auth.yaml
 	$(HELM) template --set global.tag=${TAG} \
 		--name=istio \
 		--namespace=istio-system \
@@ -736,6 +738,40 @@ generate_e2e_test_yaml: $(HELM) $(HOME)/.helm helm-repo-add
 		--values install/kubernetes/helm/istio/values.yaml \
 		install/kubernetes/helm/istio >> install/kubernetes/istio-auth.yaml
 
+	cat install/kubernetes/namespace.yaml > install/kubernetes/istio-non-mcp.yaml
+	cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/istio-non-mcp.yaml
+	$(HELM) template --set global.tag=${TAG} \
+		--name=istio \
+		--namespace=istio-system \
+		--set global.hub=${HUB} \
+		--set global.proxy.enableCoreDump=${ENABLE_COREDUMP} \
+		--set global.proxy.concurrency=1 \
+		--set prometheus.scrapeInterval=1s \
+		--set gateways.istio-ingressgateway.autoscaleMax=1 \
+		--set mixer.policy.replicaCount=2 \
+		--set mixer.policy.autoscaleEnabled=false \
+		--set global.useMCP=false \
+		--values install/kubernetes/helm/istio/values.yaml \
+		install/kubernetes/helm/istio >> install/kubernetes/istio-non-mcp.yaml
+
+	cat install/kubernetes/namespace.yaml > install/kubernetes/istio-auth-non-mcp.yaml
+	cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/istio-auth-non-mcp.yaml
+	$(HELM) template --set global.tag=${TAG} \
+		--name=istio \
+		--namespace=istio-system \
+		--set global.hub=${HUB} \
+		--set global.mtls.enabled=true \
+		--set prometheus.scrapeInterval=1s \
+		--set gateways.istio-ingressgateway.autoscaleMax=1 \
+		--set mixer.policy.replicaCount=2 \
+		--set mixer.policy.autoscaleEnabled=false \
+		--set global.controlPlaneSecurityEnabled=true \
+		--set global.proxy.enableCoreDump=${ENABLE_COREDUMP} \
+		--set global.proxy.concurrency=1 \
+		--set global.useMCP=false \
+		--values install/kubernetes/helm/istio/values.yaml \
+		install/kubernetes/helm/istio >> install/kubernetes/istio-auth-non-mcp.yaml
+
 # files generated by the default invocation of updateVersion.sh
 FILES_TO_CLEAN+=install/consul/istio.yaml \
                 install/kubernetes/addons/grafana.yaml \

README.md

@@ -4,6 +4,7 @@
 [![Go Report Card](https://goreportcard.com/badge/github.com/istio/istio)](https://goreportcard.com/report/github.com/istio/istio)
 [![GoDoc](https://godoc.org/istio.io/istio?status.svg)](https://godoc.org/istio.io/istio)
 [![codecov.io](https://codecov.io/github/istio/istio/coverage.svg?branch=master)](https://codecov.io/github/istio/istio?branch=master)
+[![GolangCI](https://golangci.com/badges/github.com/istio/istio.svg)](https://golangci.com/r/github.com/istio/istio)
 
 An open platform to connect, manage, and secure microservices.
 

addons/servicegraph/promgen/promgen.go

@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/api"
-	"github.com/prometheus/client_golang/api/prometheus/v1"
+	v1 "github.com/prometheus/client_golang/api/prometheus/v1"
 	"github.com/prometheus/common/model"
 
 	"istio.io/istio/addons/servicegraph"

bin/codecov_diff.sh

@@ -47,7 +47,7 @@ if [[ -n "${CIRCLE_PR_NUMBER:-}" ]]; then
 
   go get -u istio.io/test-infra/toolbox/githubctl
   BASE_SHA=$("${GOPATH}"/bin/githubctl --token_file="${TMP_GITHUB_TOKEN}" --op=getBaseSHA --repo=istio --pr_num="${CIRCLE_PR_NUMBER}")
-  git clean -f
+  git clean -f -d
   git checkout "${BASE_SHA}"
 
   cp "${TMP_CODECOV_SH}" ./bin/codecov.sh
@@ -56,7 +56,7 @@ if [[ -n "${CIRCLE_PR_NUMBER:-}" ]]; then
   OUT_DIR="${BASELINE_PATH}" MAXPROCS="${MAXPROCS:-}" CODECOV_SKIP="${CODECOV_SKIP:-}" ./bin/codecov.sh
 
   # Get back to the PR head
-  git clean -f
+  git clean -f -d
   git checkout "${CIRCLE_SHA1}"
 
   # Test that coverage is not dropped

bin/fmt.sh

@@ -84,7 +84,7 @@ for fl in ${GO_FILES}; do
     continue
   fi
   file_needs_formatting=$($tool $check_args "$fl")
-  if [[ ! -z "$file_needs_formatting" ]]; then
+  if [[ -n "$file_needs_formatting" ]]; then
     echo "please run bin/fmt.sh against: $file_needs_formatting"
     ERR=1
   fi

bin/get_workspace_status.sh

@@ -40,10 +40,13 @@ if [[ -n ${ISTIO_DOCKER_HUB} ]]; then
   DOCKER_HUB="${ISTIO_DOCKER_HUB}"
 fi
 
+GIT_DESCRIBE_TAG=$(git describe)
+
 # used by bin/gobuild.sh
 echo "istio.io/istio/pkg/version.buildVersion=${VERSION}"
 echo "istio.io/istio/pkg/version.buildGitRevision=${BUILD_GIT_REVISION}"
 echo "istio.io/istio/pkg/version.buildUser=$(whoami)"
 echo "istio.io/istio/pkg/version.buildHost=$(hostname -f)"
 echo "istio.io/istio/pkg/version.buildDockerHub=${DOCKER_HUB}"
 echo "istio.io/istio/pkg/version.buildStatus=${tree_status}"
+echo "istio.io/istio/pkg/version.buildTag=${GIT_DESCRIBE_TAG}"