Merge pull request istio#13207 from howardjohn/master-merge

Merge release-1.1 into master
AmitKumarDas · Apr 11, 2019 · f523998 · f523998
2 parents e5ac674 + 254577c
commit f523998
Show file tree

Hide file tree

Showing 41 changed files with 998 additions and 205 deletions.
diff --git a/install/kubernetes/helm/istio/charts/gateways/templates/_affinity.tpl b/install/kubernetes/helm/istio/charts/gateways/templates/_affinity.tpl
@@ -80,7 +80,7 @@
           matchExpressions:
           - key: {{ $item.key }}
             operator: {{ $item.operator }}
-            {{- if .value }}
+            {{- if $item.values }}
             values:
             {{- $vals := split "," $item.values }}
             {{- range $i, $v := $vals }}

diff --git a/install/kubernetes/helm/istio/charts/gateways/templates/deployment.yaml b/install/kubernetes/helm/istio/charts/gateways/templates/deployment.yaml
@@ -199,6 +199,11 @@ spec:
               fieldRef:
                 apiVersion: v1
                 fieldPath: status.podIP
+          - name: HOST_IP
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: status.hostIP
           - name: ISTIO_META_POD_NAME
             valueFrom:
               fieldRef:

diff --git a/install/kubernetes/helm/istio/charts/gateways/values.yaml b/install/kubernetes/helm/istio/charts/gateways/values.yaml
@@ -26,13 +26,13 @@ istio-ingressgateway:
   autoscaleMax: 5
   # specify replicaCount when autoscaleEnabled: false
   # replicaCount: 1
-  resources: {}
-    # limits:
-    #  cpu: 100m
-    #  memory: 128Mi
-    #requests:
-    #  cpu: 1800m
-    #  memory: 256Mi
+  resources:
+    requests:
+      cpu: 100m
+      memory: 128Mi
+    limits:
+      cpu: 2000m
+      memory: 256Mi
   cpu:
     targetAverageUtilization: 80
   loadBalancerIP: ""
@@ -143,6 +143,13 @@ istio-egressgateway:
   autoscaleMax: 5
   # specify replicaCount when autoscaleEnabled: false
   # replicaCount: 1
+  resources:
+    requests:
+      cpu: 100m
+      memory: 128Mi
+    limits:
+      cpu: 2000m
+      memory: 256Mi
   cpu:
     targetAverageUtilization: 80
   serviceAnnotations: {}

diff --git a/install/kubernetes/helm/istio/charts/grafana/dashboards/galley-dashboard.json b/install/kubernetes/helm/istio/charts/grafana/dashboards/galley-dashboard.json
@@ -1,4 +1,14 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_PROMETHEUS",
+      "label": "Prometheus",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
   "annotations": {
     "list": [
       {

diff --git a/install/kubernetes/helm/istio/templates/_affinity.tpl b/install/kubernetes/helm/istio/templates/_affinity.tpl
@@ -80,7 +80,7 @@
           matchExpressions:
           - key: {{ $item.key }}
             operator: {{ $item.operator }}
-            {{- if .value }}
+            {{- if $item.values }}
             values:
             {{- $vals := split "," $item.values }}
             {{- range $i, $v := $vals }}

diff --git a/install/kubernetes/helm/istio/templates/configmap.yaml b/install/kubernetes/helm/istio/templates/configmap.yaml
@@ -217,6 +217,11 @@ data:
         {{- else }}
           address: zipkin.{{ .Release.Namespace }}:9411
         {{- end }}
+      {{- else if eq .Values.global.proxy.tracer "datadog" }}
+      tracing:
+        datadog:
+          # Address of the Datadog Agent
+          address: {{ .Values.global.tracer.datadog.address }}
       {{- end }}
 
     {{- if .Values.global.proxy.envoyStatsd.enabled }}

diff --git a/install/kubernetes/helm/istio/templates/sidecar-injector-configmap.yaml b/install/kubernetes/helm/istio/templates/sidecar-injector-configmap.yaml
@@ -124,6 +124,9 @@ data:
       {{- else if eq .Values.global.proxy.tracer "zipkin" }}
         - --zipkinAddress
         - {{ "[[ .ProxyConfig.GetTracing.GetZipkin.GetAddress ]]" }}
+      {{- else if eq .Values.global.proxy.tracer "datadog" }}
+        - --datadogAgentAddress
+        - {{ "[[ .ProxyConfig.GetTracing.GetDatadog.GetAddress ]]" }}
       {{- end }}
       {{- if $.Values.global.proxy.logLevel }}
         - --proxyLogLevel={{ .Values.global.proxy.logLevel }}
@@ -168,6 +171,12 @@ data:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
+        {{ if eq .Values.global.proxy.tracer "datadog" }}
+        - name: HOST_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
+        {{ end }}
         - name: ISTIO_META_POD_NAME
           valueFrom:
             fieldRef:
@@ -245,11 +254,6 @@ data:
         {{ "[[- end ]]" }}
         - mountPath: /etc/istio/proxy
           name: istio-envoy
-        {{- if ne .Values.global.sds.enabled true }}
-        - mountPath: /etc/certs/
-          name: istio-certs
-          readOnly: true
-        {{- end }}
         {{- if .Values.global.sds.enabled }}
         - mountPath: /var/run/sds/uds_path
           name: sds-uds-path
@@ -258,6 +262,10 @@ data:
         - mountPath: /var/run/secrets/tokens
           name: istio-token
         {{- end }}
+        {{- else }}
+        - mountPath: /etc/certs/
+          name: istio-certs
+          readOnly: true
         {{- end }}
         {{- if and (eq .Values.global.proxy.tracer "lightstep") .Values.global.tracer.lightstep.cacertPath }}
         - mountPath: {{ "[[ directory .ProxyConfig.GetTracing.GetLightstep.GetCacertPath ]]" }}

diff --git a/install/kubernetes/helm/istio/test-values/values-e2e.yaml b/install/kubernetes/helm/istio/test-values/values-e2e.yaml
@@ -21,8 +21,24 @@ prometheus:
 gateways:
   istio-ingressgateway:
     autoscaleMax: 1
+    resources:
+      requests:
+        cpu: 10m
+        memory: 40Mi
+      limits:
+        cpu: 100m
+        memory: 128Mi
+
   istio-egressgateway:
     enabled: true
+    autoscaleMax: 1
+    resources:
+      requests:
+        cpu: 10m
+        memory: 40Mi
+      limits:
+        cpu: 100m
+        memory: 128Mi
 
 mixer:
   policy:

diff --git a/install/kubernetes/helm/istio/values-istio-demo-common.yaml b/install/kubernetes/helm/istio/values-istio-demo-common.yaml
@@ -21,6 +21,13 @@ global:
 
 pilot:
   traceSampling: 100.0
+  resources:
+    requests:
+      cpu: 10m
+      memory: 100Mi
+    limits:
+      cpu: 100m
+      memory: 200Mi
 
 mixer:
   policy:
@@ -58,5 +65,21 @@ kiali:
   createDemoSecret: true
 
 gateways:
+  istio-ingressgateway:
+    resources:
+      requests:
+        cpu: 10m
+        memory: 40Mi
+      limits:
+        cpu: 100m
+        memory: 128Mi
+
   istio-egressgateway:
     enabled: true
+    resources:
+      requests:
+        cpu: 10m
+        memory: 40Mi
+      limits:
+        cpu: 100m
+        memory: 128Mi
diff --git a/install/kubernetes/helm/istio/values.yaml b/install/kubernetes/helm/istio/values.yaml
@@ -244,7 +244,7 @@ global:
       host: # example: metrics-service.istio-system
       port: # example: 15000
 
-    # Specify which tracer to use. One of: lightstep, zipkin
+    # Specify which tracer to use. One of: lightstep, zipkin, datadog
     tracer: "zipkin"
 
   proxy_init:
@@ -292,6 +292,9 @@ global:
       # Host:Port for reporting trace data in zipkin format. If not specified, will default to
       # zipkin service (port 9411) in the same namespace as the other istio components.
       address: ""
+    datadog:
+      # Host:Port for submitting traces to the Datadog agent.
+      address: "$(HOST_IP):8126"
 
   # Default mtls policy. If true, mtls between services will be enabled by default.
   mtls:

diff --git a/istioctl/cmd/istioctl/main.go b/istioctl/cmd/istioctl/main.go
@@ -72,8 +72,9 @@ debug and diagnose their Istio mesh.
 	}
 
 	experimentalCmd = &cobra.Command{
-		Use:   "experimental",
-		Short: "Experimental commands that may be modified or deprecated",
+		Use:     "experimental",
+		Aliases: []string{"x", "exp"},
+		Short:   "Experimental commands that may be modified or deprecated",
 	}
 )
 

diff --git a/mixer/pkg/runtime/config/ephemeral.go b/mixer/pkg/runtime/config/ephemeral.go
@@ -487,6 +487,7 @@ func (e *Ephemeral) processInstanceConfigs(ctx context.Context, errs *multierror
 	for key, resource := range e.entries {
 		var info *template.Info
 		var found bool
+
 		var params proto.Message
 		instanceName := key.String()
 
@@ -508,7 +509,6 @@ func (e *Ephemeral) processInstanceConfigs(ctx context.Context, errs *multierror
 			if inst.Params == nil {
 				inst.Params = &types.Struct{Fields: make(map[string]*types.Value)}
 			}
-
 			// populate attribute bindings
 			if len(inst.AttributeBindings) > 0 {
 				bindings := &types.Struct{Fields: make(map[string]*types.Value)}
@@ -542,6 +542,7 @@ func (e *Ephemeral) processInstanceConfigs(ctx context.Context, errs *multierror
 		inferredType, err := info.InferType(params, func(s string) (config.ValueType, error) {
 			return e.checker(mode).EvalType(s)
 		})
+
 		if err != nil {
 			appendErr(ctx, errs, fmt.Sprintf("instance='%s'", instanceName), monitoring.InstanceErrs, err.Error())
 			continue

diff --git a/pilot/cmd/pilot-agent/main.go b/pilot/cmd/pilot-agent/main.go
@@ -68,6 +68,7 @@ var (
 	lightstepAccessToken       string
 	lightstepSecure            bool
 	lightstepCacertPath        string
+	datadogAgentAddress        string
 	connectTimeout             time.Duration
 	statsdUDPAddress           string
 	envoyMetricsServiceAddress string
@@ -275,6 +276,14 @@ var (
 						},
 					},
 				}
+			} else if datadogAgentAddress != "" {
+				proxyConfig.Tracing = &meshconfig.Tracing{
+					Tracer: &meshconfig.Tracing_Datadog_{
+						Datadog: &meshconfig.Tracing_Datadog{
+							Address: datadogAgentAddress,
+						},
+					},
+				}
 			}
 
 			if err := model.ValidateProxyConfig(&proxyConfig); err != nil {
@@ -517,6 +526,8 @@ func init() {
 		"Should connection to the LightStep Satellite pool be secure")
 	proxyCmd.PersistentFlags().StringVar(&lightstepCacertPath, "lightstepCacertPath", "",
 		"Path to the trusted cacert used to authenticate the pool")
+	proxyCmd.PersistentFlags().StringVar(&datadogAgentAddress, "datadogAgentAddress", "",
+		"Address of the Datadog Agent")
 	proxyCmd.PersistentFlags().DurationVar(&connectTimeout, "connectTimeout",
 		timeDuration(values.ConnectTimeout),
 		"Connection timeout used by Envoy for supporting services")

diff --git a/pilot/cmd/pilot-agent/main_test.go b/pilot/cmd/pilot-agent/main_test.go
@@ -18,11 +18,10 @@ import (
 	"os"
 	"testing"
 
-	"istio.io/istio/pilot/pkg/model"
-
 	"github.com/onsi/gomega"
 
 	meshconfig "istio.io/api/mesh/v1alpha1"
+	"istio.io/istio/pilot/pkg/model"
 	"istio.io/istio/pilot/pkg/proxy/envoy"
 	"istio.io/istio/pilot/pkg/serviceregistry"
 )

diff --git a/pilot/docker/envoy_pilot.yaml.tmpl b/pilot/docker/envoy_pilot.yaml.tmpl
@@ -59,6 +59,7 @@ static_resources:
           - {{ .MixerSubjectAltName }}
 {{- end }}
     type: STRICT_DNS
+    dns_lookup_family: V4_ONLY
   listeners:
   - address:
       socket_address:

diff --git a/pilot/docker/envoy_policy.yaml.tmpl b/pilot/docker/envoy_policy.yaml.tmpl
@@ -72,6 +72,7 @@ static_resources:
           - {{ .MixerSubjectAltName }}
 {{- end }}
     type: STRICT_DNS
+    dns_lookup_family: V4_ONLY
   listeners:
   - address:
       socket_address: