Revert "Merge release-1.1 to master (istio#11722)" (istio#11761)

This reverts commit 727e719.
AmitKumarDas · Feb 14, 2019 · 0d12266 · 0d12266
1 parent 727e719
commit 0d12266
Show file tree

Hide file tree

Showing 646 changed files with 19,318 additions and 16,786 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -241,6 +241,8 @@ jobs:
       - run: docker images
       - run:
           no_output_timeout: 20m
+          # Run the test even if previous failed
+          when: always
           name: make e2e_mixer
           command: |
             make test/local/noauth/e2e_mixer_envoyv2
@@ -275,6 +277,8 @@ jobs:
       - run: docker images
       - run:
           no_output_timeout: 20m
+          # Run the test even if previous failed
+          when: always
           name: make e2e_mixer (non-mcp)
           command: |
             E2E_ARGS="--use_mcp=false" \
@@ -314,6 +318,8 @@ jobs:
       - run: docker images
       - run:
           no_output_timeout: 20m
+          # Run the test even if previous failed
+          when: always
           name: make e2e_galley
           command: |
             make test/local/e2e_galley
@@ -337,6 +343,7 @@ jobs:
       - run: make sync
       - run:
           no_output_timeout: 20m
+          when: always
           command: |
             export PATH=$GOPATH/bin:$PATH
             make localTestEnv
@@ -374,6 +381,8 @@ jobs:
       - run: docker images
       - run:
           no_output_timeout: 20m
+          # Run the test even if previous failed
+          when: always
           command: |
                 make test/local/noauth/e2e_pilotv2
       - <<: *recordZeroExitCodeIfTestPassed
@@ -411,6 +420,8 @@ jobs:
       - run: docker images
       - run:
           no_output_timeout: 20m
+          # Run the test even if previous failed
+          when: always
           command: |
                 E2E_ARGS="--use_mcp=false" \
                 make test/local/noauth/e2e_pilotv2
@@ -445,6 +456,8 @@ jobs:
       - run: docker images
       - run:
           no_output_timeout: 20m
+          # Run the test even if previous failed
+          when: always
           command: |
                 make test/local/auth/e2e_pilotv2
       - <<: *recordZeroExitCodeIfTestPassed
@@ -542,6 +555,8 @@ jobs:
       - run: docker images
       - run:
           no_output_timeout: 20m
+          # Run the test even if previous failed
+          when: always
           command: |
                 E2E_ARGS="--use_mcp=false" \
                 make test/local/auth/e2e_pilotv2
@@ -790,7 +805,7 @@ workflows:
              branches:
                only:
                  - master
-                 - release-1.1
+                 - release-0.8
                  - release-1.0
                  - dev-networking
     jobs:
@@ -875,9 +890,6 @@ workflows:
       - e2e-pilot-cloudfoundry-v1alpha3-v2:
           requires:
             - build
-      - e2e-pilot-auth-v1alpha3-v2-non-mcp: # auth+v1alpha3+v2 without MCP
-          requires:
-            - build
       - test-integration-local:
           requires:
             - build

diff --git a/.gitignore b/.gitignore
@@ -46,7 +46,6 @@ install/kubernetes/istio-citadel-plugin-certs.yaml
 install/kubernetes/istio-citadel-standalone.yaml
 install/kubernetes/istio-citadel-with-health-check.yaml
 install/kubernetes/istio-one-namespace-auth.yaml
-install/kubernetes/istio-one-namespace-trust-domain.yaml
 install/kubernetes/istio-one-namespace.yaml
 install/kubernetes/istio-sidecar-injector-configmap-debug.yaml
 install/kubernetes/istio-sidecar-injector-configmap-release.yaml
@@ -58,6 +57,7 @@ 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

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -209,6 +209,10 @@ ignored = [
   name = "github.com/opentracing/opentracing-go"
   version = "1.0.2"
 
+[[constraint]]
+  name = "github.com/pborman/uuid"
+  version = "1.1.0"
+
 [[constraint]]
   name = "github.com/pmezard/go-difflib"
   version = "1.0.0"

diff --git a/Makefile b/Makefile
@@ -190,14 +190,6 @@ ifeq ($(TAG),)
   $(error "TAG cannot be empty")
 endif
 
-PULL_POLICY ?= IfNotPresent
-ifeq ($(TAG),latest)
-  PULL_POLICY = Always
-endif
-ifeq ($(PULL_POLICY),)
-  $(error "PULL_POLICY cannot be empty")
-endif
-
 GEN_CERT := ${ISTIO_BIN}/generate_cert
 
 # Set Google Storage bucket if not set
@@ -643,14 +635,13 @@ helm-repo-add:
 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
+	$(HELM) dep update --skip-refresh install/kubernetes/helm/istio-remote
 	$(HELM) template --name=istio --namespace=istio-system \
-		--values install/kubernetes/helm/istio/values-istio-remote.yaml \
 		--set istio_cni.enabled=${ENABLE_ISTIO_CNI} \
 		${EXTRA_HELM_SETTINGS} \
-		install/kubernetes/helm/istio >> install/kubernetes/$@
+		install/kubernetes/helm/istio-remote >> install/kubernetes/$@
 
-# create istio-init.yaml
+# 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/$@
@@ -660,7 +651,7 @@ istio-init.yaml: $(HELM) $(HOME)/.helm helm-repo-add
 		--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 istio-one-namespace-trust-domain.yaml
+# 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
@@ -681,16 +672,14 @@ generate_yaml: $(HELM) $(HOME)/.helm helm-repo-add istio-init.yaml
 	./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 \
+	$(HELM) template --set global.tag=${TAG} \
 		--name=istio \
 		--namespace=istio-system \
-		--values install/kubernetes/helm/istio/values.yaml \
 		--set global.hub=${HUB} \
-		--set global.tag=${TAG} \
-		--set global.imagePullPolicy=$(PULL_POLICY) \
 		--set global.proxy.enableCoreDump=${ENABLE_COREDUMP} \
 		--set istio_cni.enabled=${ENABLE_ISTIO_CNI} \
 		${EXTRA_HELM_SETTINGS} \
+		--values install/kubernetes/helm/istio/values.yaml \
 		install/kubernetes/helm/istio >> install/kubernetes/istio.yaml
 
 	cat install/kubernetes/namespace.yaml > install/kubernetes/istio-auth.yaml
@@ -795,7 +784,7 @@ generate_e2e_test_yaml: $(HELM) $(HOME)/.helm helm-repo-add istio-init.yaml
 		${EXTRA_HELM_SETTINGS} \
 		--values install/kubernetes/helm/istio/values-istio-sds-auth.yaml \
 		install/kubernetes/helm/istio >> install/kubernetes/istio-auth-sds.yaml
-
+		
 # files generated by the default invocation of updateVersion.sh
 FILES_TO_CLEAN+=install/consul/istio.yaml \
                 install/kubernetes/addons/grafana.yaml \
@@ -806,7 +795,6 @@ FILES_TO_CLEAN+=install/consul/istio.yaml \
                 install/kubernetes/istio-citadel-plugin-certs.yaml \
                 install/kubernetes/istio-citadel-with-health-check.yaml \
                 install/kubernetes/istio-one-namespace-auth.yaml \
-                install/kubernetes/istio-one-namespace-trust-domain.yaml \
                 install/kubernetes/istio-one-namespace.yaml \
                 install/kubernetes/istio.yaml \
                 samples/bookinfo/platform/consul/bookinfo.sidecars.yaml \

diff --git a/bin/Dockerfile.goimports b/bin/Dockerfile.goimports
diff --git a/bin/fmt.sh b/bin/fmt.sh
@@ -23,7 +23,7 @@ SCRIPTPATH=$( cd "$(dirname "$0")" ; pwd -P )
 
 # Go format tool to use
 # While 'goimports' is preferred we temporarily use 'gofmt' until https://github.com/golang/go/issues/28200 is resolved
-GO_FMT_TOOL=goimportsdocker
+GO_FMT_TOOL=gofmt
 
 check=false
 
@@ -39,21 +39,6 @@ GOPATH=$(cd "$ROOTDIR/../../.."; pwd)
 export GOPATH
 export PATH=$GOPATH/bin:$PATH
 
-PKGS=${PKGS:-"."}
-if [[ -z ${GO_FILES} ]];then
-  GO_FILES=$(find "${PKGS}" -type f -name '*.go' ! -name '*.gen.go' ! -name '*.pb.go' ! -name '*mock*.go' | grep -v ./vendor)
-fi
-
-# need to pin goimports to align with golangci-lint. SHA is from x/tools repo
-GO_IMPORTS_DOCKER="gcr.io/istio-testing/goimports:92cdcd90bf52"
-if [ $GO_FMT_TOOL = "goimportsdocker" ]; then
-  tool="docker run -i --rm \
-    -v $(pwd):/go/src/istio.io/istio \
-    -w /go/src/istio.io/istio ${GO_IMPORTS_DOCKER} /goimports"
-  check_args="-d -local istio.io"
-  fmt_args="-w -local istio.io"
-fi
-
 if [ $GO_FMT_TOOL = "goimports" ]; then
   go get -u golang.org/x/tools/cmd/goimports
   tool=${GOPATH}/bin/goimports
@@ -72,49 +57,38 @@ if [ $GO_FMT_TOOL = "gofmt" ]; then
   fmt_args="-w"
 fi
 
+PKGS=${PKGS:-"."}
+if [[ -z ${GO_FILES} ]];then
+  GO_FILES=$(find "${PKGS}" -type f -name '*.go' ! -name '*.gen.go' ! -name '*.pb.go' ! -name '*mock*.go' | grep -v ./vendor)
+fi
+
 if [ $check = false ]; then
-  echo "formatting the source files"
-  # shellcheck disable=SC2086
-  $tool $fmt_args ${GO_FILES}
-# Passing a long list of files to the tool has the benefit for a docker-based tool, since docker takes
-# a long time to start-up. However, this does not work well on circle CI due to hitting limits on argv.
-# Therefore, preserving the old style in comments, in case we want to switch to using circle again for this.
-#
-#  for fl in ${GO_FILES}; do
-#    if head -20 "$fl" | grep "Code generated by counterfeiter" > /dev/null; then
-#       continue
-#    fi
-#    if head -20 "$fl" | grep "Code generated by go-bindata" > /dev/null; then
-#       continue
-#    fi
-#    $tool $fmt_args "$fl"
-#  done
+  for fl in ${GO_FILES}; do
+    if head -20 "$fl" | grep "Code generated by counterfeiter" > /dev/null; then
+       continue
+    fi
+    if head -20 "$fl" | grep "Code generated by go-bindata" > /dev/null; then
+       continue
+    fi
+    $tool $fmt_args "$fl"
+  done
   exit $?
 fi
 
 ERR=0
-
-# shellcheck disable=SC2086
-file_needs_formatting=$($tool $check_args ${GO_FILES})
-if [[ -n "$file_needs_formatting" ]]; then
-  echo "please run bin/fmt.sh against: $file_needs_formatting"
-  ERR=1
-fi
-
-# for fl in ${GO_FILES}; do
-#  $tool $check_args $fl
-#  if head -20 "$fl" | grep "Code generated by counterfeiter" > /dev/null; then
-#    continue
-#  fi
-#  if head -20 "$fl" | grep "Code generated by go-bindata" > /dev/null; then
-#    continue
-#  fi
-#  file_needs_formatting=$($tool $check_args "$fl")
-#  if [[ -n "$file_needs_formatting" ]]; then
-#    echo "please run bin/fmt.sh against: $file_needs_formatting"
-#    ERR=1
-#  fi
-#done
+for fl in ${GO_FILES}; do
+  if head -20 "$fl" | grep "Code generated by counterfeiter" > /dev/null; then
+    continue
+  fi
+  if head -20 "$fl" | grep "Code generated by go-bindata" > /dev/null; then
+    continue
+  fi
+  file_needs_formatting=$($tool $check_args "$fl")
+  if [[ -n "$file_needs_formatting" ]]; then
+    echo "please run bin/fmt.sh against: $file_needs_formatting"
+    ERR=1
+  fi
+done
 
 if ((ERR != 0)); then
   exit 1