lambdai
diff --git a/‎Gopkg.lock
+26-4 b/‎Gopkg.lock
+26-4
diff --git a/‎Gopkg.toml
+4 b/‎Gopkg.toml
+4
diff --git a/‎Makefile
+14-1 b/‎Makefile
+14-1
diff --git a/‎bin/linters.sh
-1 b/‎bin/linters.sh
-1
diff --git a/‎bin/testEnvRootMinikube.sh
+25-1 b/‎bin/testEnvRootMinikube.sh
+25-1
diff --git a/‎codecov.skip
+1 b/‎codecov.skip
+1
diff --git a/‎codecov.threshold
+8 b/‎codecov.threshold
+8
diff --git a/‎docker/Dockerfile.bionic_debug
+36 b/‎docker/Dockerfile.bionic_debug
+36
diff --git a/‎docker/Dockerfile.deb_debug
+37 b/‎docker/Dockerfile.deb_debug
+37
diff --git a/‎docker/Dockerfile.xenial_debug
+2-3 b/‎docker/Dockerfile.xenial_debug
+2-3
diff --git a/‎downloadIstio.sh
-35 b/‎downloadIstio.sh
-35
diff --git a/‎galley/cmd/galley/cmd/probe.go
+7-5 b/‎galley/cmd/galley/cmd/probe.go
+7-5
@@ -362,3 +362,7 @@ ignored = [
 [[override]]
   name = "github.com/imdario/mergo"
   revision = "6633656539c1639d9d78127b7d47c622b5d7b6dc"
+
+[[constraint]]
+  name = "github.com/google/go-cmp"
+  version = "0.2.0"
@@ -450,7 +450,7 @@ test: | $(JUNIT_REPORT)
 	$(MAKE) --keep-going $(TEST_OBJ) \
 	2>&1 | tee >($(JUNIT_REPORT) > $(JUNIT_UNIT_TEST_XML))
 
-GOTEST_PARALLEL ?= '-test.parallel=4'
+GOTEST_PARALLEL ?= '-test.parallel=2'
 # This is passed to mixer and other tests to limit how many builds are used.
 # In CircleCI, set in "Project Settings" -> "Environment variables" as "-p 2" if you don't have xlarge machines
 GOTEST_P ?=
@@ -772,6 +772,19 @@ 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-non-mcp.yaml
 
+	cat install/kubernetes/namespace.yaml > install/kubernetes/istio-auth-sds.yaml
+	cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/istio-auth-sds.yaml
+	$(HELM) template --set global.tag=${TAG} \
+		--name=istio \
+		--namespace=istio-system \
+		--set global.hub=${HUB} \
+		--set global.mtls.enabled=true \
+		--set global.proxy.enableCoreDump=true \
+		--set istio_cni.enabled=${ENABLE_ISTIO_CNI} \
+		${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 \
 
@@ -142,4 +142,3 @@ install_gometalinter
 run_gometalinter
 run_helm_lint
 check_grafana_dashboards
-check_licenses
@@ -61,7 +61,31 @@ function startMinikubeNone() {
     export MINIKUBE_WANTREPORTERRORPROMPT=false
     export MINIKUBE_HOME=$HOME
     export CHANGE_MINIKUBE_NONE_USER=true
-	echo "IP forwarding setting: $(cat /proc/sys/net/ipv4/ip_forward)"
+
+    # Troubleshoot problem with Docker build on some CircleCI machines
+    if [ -f /proc/sys/net/ipv4/ip_forward ]; then
+      echo "IP forwarding setting: $(cat /proc/sys/net/ipv4/ip_forward)"
+      echo "My hostname is:"
+      hostname
+      echo "My distro is:"
+      cat /etc/*-release
+      echo "Contents of /etc/sysctl.d/"
+      ls -l /etc/sysctl.d/ || true
+      echo "Contents of /etc/sysctl.conf"
+      grep ip_forward /etc/sysctl.conf
+      echo "Config files setting ip_forward"
+      find /etc/sysctl.d/ -type f -exec grep ip_forward \{\} \; -print
+      if [ "$(cat /proc/sys/net/ipv4/ip_forward)" -eq 0 ]; then
+        whoami
+        echo "Cannot build images without IPv4 forwarding, attempting to turn on forwarding"
+        sudo sysctl -w net.ipv4.ip_forward=1
+        if [ "$(cat /proc/sys/net/ipv4/ip_forward)" -eq 0 ]; then
+          echo "Cannot build images without IPv4 forwarding"
+          exit 1
+        fi
+      fi
+    fi
+
     sudo -E minikube start \
          --kubernetes-version=v1.9.0 \
          --vm-driver=none \
 
@@ -14,6 +14,7 @@ istio.io/istio/tests/codecov
 istio.io/istio/tests/e2e
 istio.io/istio/tests/integration2/examples
 istio.io/istio/tests/integration2/qualification
+istio.io/istio/tests/integration2
 istio.io/istio/tests/integration_old
 istio.io/istio/tests/local
 istio.io/istio/tests/util
 
@@ -25,4 +25,12 @@ istio.io/istio/pkg/mcp/creds/watcher.go=100
 istio.io/istio/pkg/test=100
 istio.io/istio/security/proto=100
 istio.io/istio/security/pkg/nodeagent=15
+istio.io/istio/galley/pkg/testing=100
 
+# Temporary until integ tests are restored
+istio.io/istio/pilot/pkg/networking/plugin=50
+istio.io/istio/galley/pkg/runtime=30
+istio.io/istio/galley/pkg/kube/converter/legacy/legacymixer.pb.go=10
+istio.io/istio/galley/pkg/meshconfig/cache.go=100
+istio.io/istio/pkg/mcp/server/monitoring.go=50
+istio.io/istio/pilot/pkg/model/authentication.go=20
@@ -0,0 +1,36 @@
+FROM ubuntu:bionic
+# Base image for debug builds.
+# Built manually uploaded as "istionightly/base_debug"
+
+# Do not add more stuff to this list that isn't small or critically useful.
+# If you occasionally need something on the container do
+# sudo apt-get update && apt-get whichever
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y \
+      curl \
+      iptables \
+      iproute2 \
+      iputils-ping \
+      knot-dnsutils \
+      netcat \
+      tcpdump \
+      net-tools \
+      lsof \
+      sudo && \
+      apt-get clean -y && \
+      rm -rf /var/cache/debconf/* /var/lib/apt/lists/* \
+        /var/log/* /tmp/*  /var/tmp/*
+
+# Required:
+# iptables (1.8M) (required in init, for debugging in the other cases)
+# iproute2 (1.5M) (required for init)
+
+# Debug:
+# curl (11M)
+# tcpdump (5M)
+# netcat (0.2M)
+# net-tools (0.7M): netstat
+# lsof (0.5M): for debugging open socket, file descriptors
+# knot-dnsutils (4.5M): dig/nslookup
+
+# Alternative: dnsutils(44M) for dig/nslookup
@@ -0,0 +1,37 @@
+FROM debian:9-slim
+
+# Base image for debug builds - base is 22M
+# Built manually uploaded as "istionightly/base_debug"
+
+# Do not add more stuff to this list that isn't small or critically useful.
+# If you occasionally need something on the container do
+# sudo apt-get update && apt-get whichever
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y \
+      curl \
+      iptables \
+      iproute2 \
+      iputils-ping \
+      knot-dnsutils \
+      netcat \
+      tcpdump \
+      net-tools \
+      lsof \
+      sudo &&  apt-get upgrade -y && \
+      apt-get clean -y && \
+      rm -rf /var/cache/debconf/* /var/lib/apt/lists/* \
+        /var/log/* /tmp/*  /var/tmp/*
+
+# Required:
+# iptables (1.8M) (required in init, for debugging in the other cases)
+# iproute2 (1.5M) (required for init)
+
+# Debug:
+# curl (11M)
+# tcpdump (5M)
+# netcat (0.2M)
+# net-tools (0.7M): netstat
+# lsof (0.5M): for debugging open socket, file descriptors
+# knot-dnsutils (4.5M): dig/nslookup
+
+# Alternative: dnsutils(44M) for dig/nslookup
@@ -10,16 +10,15 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
+      ca-certificates \
       curl \
       iptables \
       iproute2 \
       iputils-ping \
-      dnsutils \
+      knot-dnsutils \
       netcat \
       tcpdump \
       net-tools \
-      libc6-dbg gdb \
-      elvis-tiny \
       lsof \
       linux-tools-generic \
       sudo && apt-get upgrade -y && \
 
@@ -15,13 +15,14 @@
 package cmd
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 
-	"istio.io/istio/galley/cmd/shared"
 	"istio.io/istio/pkg/probe"
 )
 
-func probeCmd(printf, fatalf shared.FormatFn) *cobra.Command {
+func probeCmd() *cobra.Command {
 	var (
 		probeOptions probe.Options
 	)
@@ -31,12 +32,13 @@ func probeCmd(printf, fatalf shared.FormatFn) *cobra.Command {
 		Short: "Check the liveness or readiness of a locally-running server",
 		Run: func(cmd *cobra.Command, _ []string) {
 			if !probeOptions.IsValid() {
-				fatalf("some options are not valid")
+				fmt.Fprintf(cmd.OutOrStdout(), "some options are not valid")
+				return
 			}
 			if err := probe.NewFileClient(&probeOptions).GetStatus(); err != nil {
-				fatalf("fail on inspecting path %s: %v", probeOptions.Path, err)
+				fmt.Fprintf(cmd.OutOrStdout(), "fail on inspecting path %s: %v", probeOptions.Path, err)
 			}
-			printf("OK")
+			fmt.Fprintf(cmd.OutOrStdout(), "OK")
 		},
 	}
 	probeCmd.PersistentFlags().StringVar(&probeOptions.Path, "probe-path", "",