Merge release-1.1 into master #13207

howardjohn · 2019-04-10T16:30:05Z

Needs to be manually merged so changes are not squashed

* respect the lb weight setting from users * add ut * fix golint * add locality lb setting test * fix lint * update test case * update test case * lint

…o#12724) * auto bind to TCP services for egress ports in Sidecar Signed-off-by: Shriram Rajagopalan <rshriram@gmail.com> * fix test Signed-off-by: Shriram Rajagopalan <rshriram@gmail.com>

* check match direction * Cleanup http route generation * undo pickMatching change * golangbot comments * address review comments * fix validation bug * gofmt * check for intersection duplicates

* Add wildcard route fallthrough Currently, ALLOW_ANY doesn't actually allow any external traffic if there is an http service already present on a port. This change adds a wildcard PassthroughCluster as the final route, allowing external traffic even if there is already a service on the port. Additionally, in REGISTRY_ONLY mode, we will return a 404 error if there is already an http service. This is misleading, as it can be conflated with a 404 error returned from the actual service. When in REGISTRY_ONLY mode, we instead return a 502 error to indicate the request is blocked. * add unit tests * Remove node-level flag * Fix tests

…ver adapter (istio#12850) (istio#12936) * Change Ip Address to readable format in accesslog from stdio adapter * Add a check to validate it's an IP Address before calling ip.string function * Fix formatting error * Fix test * Correct stringify function in instanceUtil.go too for IP address * Fix based on review * Fix based on review * Fix based on review

* do ipv4 lookups for pilot and zipkin Signed-off-by: Shriram Rajagopalan <rshriram@gmail.com> * update goldens Signed-off-by: Shriram Rajagopalan <rshriram@gmail.com>

* Cherry pick from master: Configuration: no longer hardcode mesh certs (istio#12189) * Configuration: Pilot-Agent: no longer hardcode certs to watch. Pilot-Discovery: no longer hardcode Envoy listener cert paths. * Address demands of golangcibot overlord * Change usages of github.com/stretchr/testify/require to github.com/stretchr/testify/assert * Address code style violation * Revert temporary api changes. Set cert paths in envoy node metadata and use them when setting up listeners * Use envoy node metadata cert paths (if available) when constructing clusters * Rename constants to make golint happy * Fix imports * Ignore ordering in test * Pass around proxy instead of proxy.Metadata (cherry picked from commit 7c34274) * goimports file

* Add support for datadog tracing. Signed-off-by: Caleb Gilmour <caleb.gilmour@datadoghq.com> * Use $(HOST_IP) instead of special-casing empty address value Signed-off-by: Caleb Gilmour <caleb.gilmour@datadoghq.com>

…tor (istio#13054)

* Add x alias to experimental istioctl command I'm super lazy and experimental is far too much effort to type Signed-off-by: Liam White <liam@tetrate.io> * Add exp as an additional alias Signed-off-by: Liam White <liam@tetrate.io>

* Add jitter in CSR request * Add log * Fix comments * Fix test * Fix test * Fix comment

…#12458) (istio#12730)

* Fix updateClusterInc for overlapping ports It is possible that a service will have multiple ports, with the same port number. The typical example here is kube-dns, which uses port 53 for UDP and TCP. When we do an incremental push, we would select the first port to match the port number, which would sometimes causes us to ignore the correct port. This fix searches through all matching ports. * Ensure port number matches as well * Add unit tests * remove dead code

Also fixes bug where non-kube envs could override to something that parsed incorrectly Signed-off-by: Liam White <liam@tetrate.io>

…12815) * cherry pick subset of istio#12689 Signed-off-by: Kuat Yessenov <kuat@google.com> * add support for compiled in adapters Signed-off-by: Kuat Yessenov <kuat@google.com> * patch log line Signed-off-by: Kuat Yessenov <kuat@google.com>

* Reduce Pilot resource requests for demo * Add limits as well

Fixes: istio#13040

istio-testing · 2019-04-10T16:30:17Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: howardjohn
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: geeknoid

If they are not already assigned, you can assign the PR to them by writing /assign @geeknoid in a comment when ready.

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

googlebot · 2019-04-10T16:30:26Z

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

ℹ️ Googlers: Go here for more info.

codecov · 2019-04-10T16:31:29Z

Codecov Report

Merging #13207 into master will increase coverage by 1%.
The diff coverage is 81%.

@@            Coverage Diff            @@
##           master   #13207     +/-   ##
=========================================
+ Coverage      72%      72%     +1%     
=========================================
  Files         659      607     -52     
  Lines       56634    53994   -2640     
=========================================
- Hits        40211    38448   -1763     
+ Misses      14134    13401    -733     
+ Partials     2289     2145    -144

Impacted Files	Coverage Δ
istioctl/cmd/istioctl/main.go	`68% <ø> (-1%)`	⬇️
security/pkg/nodeagent/cache/secretcache.go	`78% <100%> (+2%)`	⬆️
pilot/pkg/networking/core/v1alpha3/cluster.go	`85% <100%> (+1%)`	⬆️
pilot/pkg/model/context.go	`77% <100%> (+1%)`	⬆️
...ilot/pkg/networking/plugin/authn/authentication.go	`91% <100%> (+1%)`	⬆️
pilot/pkg/networking/core/v1alpha3/listener.go	`86% <100%> (+1%)`	⬆️
istioctl/pkg/writer/envoy/configdump/cluster.go	`80% <100%> (ø)`	⬆️
pilot/pkg/model/service.go	`92% <100%> (+2%)`	⬆️
mixer/adapter/stdio/stdio.go	`100% <100%> (ø)`	⬆️
pkg/features/pilot/pilot.go	`100% <100%> (ø)`	⬆️
... and 374 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4ae096d...254577c. Read the comment docs.

codecov · 2019-04-10T16:31:29Z

Codecov Report

Merging #13207 into master will increase coverage by 1%.
The diff coverage is 81%.

@@            Coverage Diff            @@
##           master   #13207     +/-   ##
=========================================
+ Coverage      72%      72%     +1%     
=========================================
  Files         659      607     -52     
  Lines       56634    53994   -2640     
=========================================
- Hits        40211    38448   -1763     
+ Misses      14134    13401    -733     
+ Partials     2289     2145    -144

Impacted Files	Coverage Δ
istioctl/cmd/istioctl/main.go	`68% <ø> (-1%)`	⬇️
security/pkg/nodeagent/cache/secretcache.go	`78% <100%> (+2%)`	⬆️
pilot/pkg/networking/core/v1alpha3/cluster.go	`85% <100%> (+1%)`	⬆️
pilot/pkg/model/context.go	`77% <100%> (+1%)`	⬆️
...ilot/pkg/networking/plugin/authn/authentication.go	`91% <100%> (+1%)`	⬆️
pilot/pkg/networking/core/v1alpha3/listener.go	`86% <100%> (+1%)`	⬆️
istioctl/pkg/writer/envoy/configdump/cluster.go	`80% <100%> (ø)`	⬆️
pilot/pkg/model/service.go	`92% <100%> (+2%)`	⬆️
mixer/adapter/stdio/stdio.go	`100% <100%> (ø)`	⬆️
pkg/features/pilot/pilot.go	`100% <100%> (ø)`	⬆️
... and 374 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4ae096d...254577c. Read the comment docs.

istio-testing · 2019-04-10T17:07:00Z

@howardjohn: The following tests failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
prow/istio-pilot-multicluster-e2e.sh	`254577c`	link	`/test istio-pilot-multicluster-e2e`
prow/istio-integ-k8s-tests.sh	`254577c`	link	`/test istio-integ-k8s-tests`

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

googlebot · 2019-04-10T22:28:02Z

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

howardjohn · 2019-04-10T22:28:16Z

All failures are known failures

lei-tang and others added 26 commits March 29, 2019 14:20

Add two sample deployments for user guide of Istio Vault integration (i…

03ec4b4

…stio#12917)

prevent duplicate inbound listeners (istio#12937)

7531ca1

respect locality weight set from ServiceEntry (istio#12714)

c976389

* respect the lb weight setting from users * add ut * fix golint * add locality lb setting test * fix lint * update test case * update test case * lint

Auto bind to services for Sidecar listeners with specific ports (isti…

67085ad

…o#12724) * auto bind to TCP services for egress ports in Sidecar Signed-off-by: Shriram Rajagopalan <rshriram@gmail.com> * fix test Signed-off-by: Shriram Rajagopalan <rshriram@gmail.com>

Cleanup gateway vhost config gen (istio#12847)

78f5101

* check match direction * Cleanup http route generation * undo pickMatching change * golangbot comments * address review comments * fix validation bug * gofmt * check for intersection duplicates

use only ipv4 for pilot and zipkin (istio#12997)

8b1c2ca

* do ipv4 lookups for pilot and zipkin Signed-off-by: Shriram Rajagopalan <rshriram@gmail.com> * update goldens Signed-off-by: Shriram Rajagopalan <rshriram@gmail.com>

Add support for datadog tracing (on release-1.1 branch) (istio#12687)

d6aeaa4

* Add support for datadog tracing. Signed-off-by: Caleb Gilmour <caleb.gilmour@datadoghq.com> * Use $(HOST_IP) instead of special-casing empty address value Signed-off-by: Caleb Gilmour <caleb.gilmour@datadoghq.com>

fix validation logic so that port.name is no longer a valid PortSelec…

deefb3e

…tor (istio#13054)

Update tracing_datadog_golden.json (istio#13082)

8f236ca

Add jitter in CSR request (istio#12805)

cfec067

* Add jitter in CSR request * Add log * Fix comments * Fix test * Fix test * Fix comment

'istioctl proxy-config clusters' cluster type column rendering (istio…

c4b53d7

…#12458) (istio#12730)

update sds secret mount. (istio#12733)

41b831f

Copy data from right place (istio#12762)

d7f1286

Allow overriding of registry locality (istio#13077)

7e813b4

Also fixes bug where non-kube envs could override to something that parsed incorrectly Signed-off-by: Liam White <liam@tetrate.io>

Reduce Pilot resource requests for demo (istio#12477)

4a2b001

* Reduce Pilot resource requests for demo * Add limits as well

Added data source for Galley dashboard (istio#13041)

aec5f8b

Fixes: istio#13040

fix values for pod anti-affinity. (istio#12798)

75b00d7

Add sensible defaults to istio-gateways (istio#12315)

bfea604

Merge branch 'release-1.1' into master-merge

516a21e

Run format and linter

254577c

howardjohn added the do-not-merge/hold Block automatic merging of a PR. label Apr 10, 2019

istio-testing requested review from geeknoid, GregHanson and kyessenov April 10, 2019 16:30

istio-testing requested review from linsun, mandarjog, nmittler, ostromart, rshriram and utka April 10, 2019 16:30

googlebot added the cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. label Apr 10, 2019

howardjohn added cla: human-approved and removed cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. labels Apr 10, 2019

liamawhite mentioned this pull request Apr 11, 2019

Locality LB Integration test failures #13227

Closed

rshriram approved these changes Apr 11, 2019

View reviewed changes

rshriram merged commit f523998 into istio:master Apr 11, 2019

howardjohn deleted the master-merge branch April 11, 2019 15:38

cgilmour mentioned this pull request Apr 12, 2019

Add support for datadog tracing. #11855

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge release-1.1 into master #13207

Merge release-1.1 into master #13207

howardjohn commented Apr 10, 2019

istio-testing commented Apr 10, 2019

googlebot commented Apr 10, 2019

codecov bot commented Apr 10, 2019 •

edited

Loading

codecov bot commented Apr 10, 2019

istio-testing commented Apr 10, 2019

googlebot commented Apr 10, 2019

howardjohn commented Apr 10, 2019

Merge release-1.1 into master #13207

Merge release-1.1 into master #13207

Conversation

howardjohn commented Apr 10, 2019

istio-testing commented Apr 10, 2019

googlebot commented Apr 10, 2019

codecov bot commented Apr 10, 2019 • edited Loading

Codecov Report

codecov bot commented Apr 10, 2019

Codecov Report

istio-testing commented Apr 10, 2019

googlebot commented Apr 10, 2019

howardjohn commented Apr 10, 2019

codecov bot commented Apr 10, 2019 •

edited

Loading