Skip to content

Merge branch 'release-1.0' into 'collab-gcp-identity'#7305

Merged
istio-testing merged 70 commits intoistio:collab-gcp-identityfrom
quanjielin:quanlinmerge3
Jul 23, 2018
Merged

Merge branch 'release-1.0' into 'collab-gcp-identity'#7305
istio-testing merged 70 commits intoistio:collab-gcp-identityfrom
quanjielin:quanlinmerge3

Conversation

@quanjielin
Copy link
Copy Markdown
Contributor

No description provided.

gargnupur and others added 30 commits July 13, 2018 10:21
* Setup initial liveness probe for Mixer

* Prefer /version to /metrics
* Updating Kiali to v0.5.0

* Adding quotaspecs and quotaspecbindings in clusterole

* Upgrading Kiali Versrion on Requirements File
Signed-off-by: Kuat Yessenov <kuat@google.com>
…ecurity (istio#7094)

When controlPlaneSecurityEnabled the spiffe configured by sidecar injector
assumes that the pilot discoveryAddress is a hostname.namespace formatted
string.  This change makes the istio-remote helm chart setup a selectorless
service and endpoint from the pilotAddress when the remotePilotCreateSvcEndpoint
arg is true and sets the MeshConfig discoveryAddress to be the hostname
for istio-pilot.
* Make version, timestamp available in service for k8s

* More error and metrics cleanup

* Address Shriram's comments

* Format

* Fix verbose log, format, init

* More work - the push is async, and things are trickier than they look

* Rename mixer job, so upgrade works

* Add back iperf3 without sidecar

* Format

* Switch to *env, no copy by value

* Cleanup, resolve conflicts

* Also convert node to pointer, and add explicit param

* Polish, cleanups

* Revert changes moved to other PRs

* Logging too much

* Polish, less log

* Extra safety, sometimes a stale message is stuck until config change

* fmt and lint errors

* Addres review comments

* Add the ttls test

* Revert the review fix - it breaks tests (some send old style).
Will update post 1.1
* TCP routing cleanups: part 1

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

* missing sort

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

* sort destination cidrs

* proxy sha update

* undo istio proxy sha

* fixups

* compile fixes

* nil check

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

* nits

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

* Update proxy sha based on Piotrs changes

* undo Piotrs changes
This is needed to better support e2e testing of conflicts.
* add latest tag to values.yaml

* switch latest in istioctl
Signed-off-by: Kuat Yessenov <kuat@google.com>
* Adding unit test for TCP over TCP conflicts.

* addressing comments.

* addressing comments.

* addressing comments.
* Assorted small fixes

* spaces
* remove static route generation

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

* more validation for gateways

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

* validation fixes

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

* fix test

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
This change makes the zipkin arguement in
the sidecar config map to be conditional
based on zipkin being used in remote clusters.
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 21, 2018

Codecov Report

Merging #7305 into collab-gcp-identity will increase coverage by 1%.
The diff coverage is 52%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##           collab-gcp-identity   #7305    +/-   ##
====================================================
+ Coverage                   72%     72%    +1%     
====================================================
  Files                      358     356     -2     
  Lines                    30644   30468   -176     
====================================================
- Hits                     21943   21839   -104     
+ Misses                    7762    7710    -52     
+ Partials                   939     919    -20
Impacted Files Coverage Δ
pilot/pkg/model/context.go 63% <ø> (ø) ⬆️
mixer/adapter/redisquota/redisquota.go 90% <ø> (ø) ⬆️
pilot/pkg/model/jwks_resolver.go 68% <ø> (ø) ⬆️
galley/pkg/runtime/resource/types.go 100% <ø> (ø) ⬆️
pilot/pkg/model/authentication.go 67% <ø> (-5%) ⬇️
istioctl/cmd/istioctl/gendeployment/cmd.go 30% <0%> (ø) ⬆️
pilot/pkg/config/kube/ingress/controller.go 0% <0%> (ø) ⬆️
mixer/adapter/rbac/rbac.go 11% <0%> (ø) ⬇️
mixer/pkg/config/crd/init.go 0% <0%> (ø) ⬆️
pilot/pkg/model/gateway.go 0% <0%> (ø) ⬆️
... and 65 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 a821188...b6eded4. Read the comment docs.

@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 21, 2018
@quanjielin quanjielin requested a review from hklai July 21, 2018 22:57
@quanjielin
Copy link
Copy Markdown
Contributor Author

/cc @wattli

@istio-testing istio-testing requested a review from wattli July 23, 2018 18:38
@quanjielin quanjielin added cla: yes and removed cla: no Set by the Google CLA bot to indicate the author of a PR has not signed the Google CLA. labels Jul 23, 2018
@googlebot
Copy link
Copy Markdown
Collaborator

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.)

Copy link
Copy Markdown
Contributor

@wattli wattli left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@istio-testing
Copy link
Copy Markdown
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: quanjielin, wattli

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

@istio-testing istio-testing merged commit fe9dd33 into istio:collab-gcp-identity Jul 23, 2018
incfly pushed a commit to incfly/istio that referenced this pull request Aug 17, 2018
incfly pushed a commit that referenced this pull request Aug 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.