Skip to content

Cherry picking bug fixes from master into release-1.0#6834

Merged
rshriram merged 6 commits intorelease-1.0from
master
Jul 4, 2018
Merged

Cherry picking bug fixes from master into release-1.0#6834
rshriram merged 6 commits intorelease-1.0from
master

Conversation

@rshriram
Copy link
Copy Markdown
Member

@rshriram rshriram commented Jul 3, 2018

SNI routing
Costin's fixes for global mesh config
Greg Hanson's fixes for Consul/Eureka templates
some mixer bug fixes.

Please wait until all tests pass.

quanjielin and others added 6 commits July 2, 2018 20:08
* Add values for config map settings, including access log.
More docs.

* Updates and improvements for the stress-testing configs.
* Add values for config map settings, including access log.
More docs.

* Updates and improvements for the stress-testing configs.

* Address review comments

* Merged wrong files

* Add the setup helm file - this change now depend on the previous PR.

* Sync with remote, remove accidentally added files.

* Another accidental file
* quick sni matching 1st pass with no refactoring of existing code

* use shriram's api sha

* quick pass at using tls block

* add some validation

* copyright

* fix lint + remove deadcode

* rename protocol tcp_tls -> tls

* update back to istio/api master

* remove accidentally added test file

* add tls block to gateway logic

* add todos

* basic sni wildcard implementation

* add tcp, fix problems with rbac, matching

* better tcp + tls validation

* address code review comments

* remove out of date comment

* update comments

* fix compile error

* use tcp proxy in tcp routing

* add tcp routing e2e test

* add forgotten vs config file + update description of test

* Comments, bug fixes

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* cleanup gateway tcp test

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* moving networking test yamls

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* tcp/tls tests

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* yaml fixes

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* fix file switcheroo

* port matches

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* fix authN plugin overwriting TLS context

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* more tests - route via egress gateway

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* yaml fixes

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* initialize prom variables

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* split tests

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* final test fix hopefully

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>

* revert gateway tweaks

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
@googlebot
Copy link
Copy Markdown
Collaborator

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 the commit author(s) and merge this pull request when appropriate.

@googlebot 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 Jul 3, 2018
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 3, 2018

Codecov Report

Merging #6834 into release-1.0 will decrease coverage by 1%.
The diff coverage is 8%.

Impacted file tree graph

@@             Coverage Diff              @@
##           release-1.0   #6834    +/-   ##
============================================
- Coverage           71%     71%   -<1%     
============================================
  Files              369     369            
  Lines            31936   32071   +135     
============================================
+ Hits             22564   22577    +13     
- Misses            8448    8577   +129     
+ Partials           924     917     -7
Impacted Files Coverage Δ
pilot/pkg/networking/core/v1alpha3/gateway.go 0% <ø> (ø) ⬆️
...ilot/pkg/networking/core/v1alpha3/networkfilter.go 0% <0%> (ø) ⬆️
pilot/pkg/networking/core/v1alpha3/tls.go 0% <0%> (ø)
...ilot/pkg/networking/plugin/authn/authentication.go 74% <0%> (ø) ⬇️
pilot/pkg/model/service.go 77% <0%> (ø) ⬆️
pilot/pkg/model/validation.go 86% <19%> (-3%) ⬇️
pilot/pkg/networking/core/v1alpha3/listener.go 1% <4%> (+1%) ⬆️
galley/pkg/mcp/client/client.go 71% <0%> (-9%) ⬇️
mixer/adapter/kubernetesenv/kubernetesenv.go 84% <0%> (-4%) ⬇️
...olarwinds/internal/papertrail/papertrail_logger.go 59% <0%> (-3%) ⬇️
... and 19 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 6c8b287...560c9f9. Read the comment docs.

Copy link
Copy Markdown
Contributor

@costinm costinm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve
/lgtm

@istio-testing
Copy link
Copy Markdown
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: costinm, rshriram

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@rshriram rshriram merged commit 704a275 into release-1.0 Jul 4, 2018
@nmittler
Copy link
Copy Markdown
Contributor

@rshriram from what I can tell, the following PRs/commits from master are included in this:

#6402 (560c9f9)
#6797 (65a76fb)
#6800 (62d0e30)
#6790 (a82c55a)
#6785 (dc5264b)

Am I missing anything?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants