Skip to content

Merge release-1.1 into master#11096

Merged
hklai merged 96 commits intoistio:masterfrom
hklai:1.1-master
Jan 19, 2019
Merged

Merge release-1.1 into master#11096
hklai merged 96 commits intoistio:masterfrom
hklai:1.1-master

Conversation

@hklai
Copy link
Copy Markdown
Contributor

@hklai hklai commented Jan 19, 2019

No description provided.

kyessenov and others added 30 commits January 9, 2019 12:43
Signed-off-by: Kuat Yessenov <kuat@google.com>
…stio#10492)

See issue istio#10487

- kubernetes-pods job is now keeping all targets without sidecar or with expicit prometheus.io/scheme=http annotation
- kubernetes-pods-istio-secure is now discarding targets with expicit prometheus.io/scheme=http annotation
* Relax test for kubeenv metric to only error on 'unknowns'

* Add check to ensure that at least one metric is found

* Address lint issues
* Fix Citadel Kube JWT authentication.

* Small fix.

* Fix unittest.

* Add unit test for coverage.
* Sidecar config implementation

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

* build fixes

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

* adding CRD template

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

* format

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

* model.Sidecar to model.SidecarProxy

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

* nits

* gen files in galley

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

* nit

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

* test fix

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

* e2e tests

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

* comments

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

* compile fix

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

* final snafu

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

* fix yaml path

* typo

* bad file name

* future work

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

* fix bad namespace

* assorted fixes

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

* fixing CDS

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

* formatting

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

* vendor update

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

* lint

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

* build fixes

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

* undos

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

* lint

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

* nits

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

* test fix

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

* validation

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

* format

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

* comments

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

* format

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

* new crd yaml

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

* nix listener port

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

* kubernetes hack for parsing namespace

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

* some code cleanups and more TODOs

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

* more undos

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

* spell check

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

* more nits

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

* lint

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

* leftovers

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

* undo tests

* more undos

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

* more undos

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

* del

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

* sidecarproxy

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

* format

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

* compile fixes

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
* run log Configure before running server and validation

* remove p.logConfigure func from patchTable

* fix lint

* fix rebase error

* fix rebase error

* fix lint
* Use 128bit traceids in envoy

* Update unit test golden files for bootstrap config
* sync with latest istio.io/api

This PR syncs to the latest changes from istio.io/api. Notably, this
PR includes the enhanced MCP service definitions and protos
(ResourceSink and ResourceSource) along with several API
cleanups. Minimal changes have been made to fix the build and tests so
that subsequent istio.io/api changes can be merged into
istio/istio. An additional PR will be introduced to implement the
enhanced MCP service layer.

* address review comments

* remove bad find/replace
…#10879)

* Add a newline at the end of a certificate

* Fix the mock test

* Fix a lint error
* Log additional information about build machine

* Attempt to enable IPv4 forwarding

* tabs to spaces
* stop mcpclient when mixer stops

* fix test
…ow (istio#10887)

* add integration test that mTLS through identity provisioned by SDS flow

* format
* fix pilot goroutine leak

* remove done channel
…stio#10154)

* Do not fail envoy health probe if a config was rejected (istio#9786)

* Adjust so that rejection is also an allowed state of health probe for envoy.

Co-authored-by: Ralf Pannemans <ralf.pannemans@sap.com>

* Add unit tests for envoy health probe

Co-authored-by: Ralf Pannemans <ralf.pannemans@sap.com>

* Fixed linting

Co-authored-by: Ralf Pannemans <ralf.pannemans@sap.com>

* Fix another linting problem

Co-authored-by: Ralf Pannemans <ralf.pannemans@sap.com>

* Add new stats to String() method

* Use better wording in log message

* Fix linting

Co-authored-by: Ulrich Kramer <u.kramer@sap.com>
* Move everything related to spiffe URIs to package spiffe

Co-authored-by: Ulrich Kramer <u.kramer@sap.com>

* Fix end-to-end tests after merge

Co-authored-by: Julia Plachetka <julia.plachetka@sap.com>

* Adapt and fix unit tests.

Co-authored-by: Ralf Pannemans <ralf.pannemans@sap.com>

* Adapt and fix unit tests.

* Fix lint errors and unit tests

* Fix lint errors

* Fix lint errors

* Fix lint errors. Exit integration test in case of nonexisting secret

* Remove duplicate trustDomain

* Fixed compile errors

* Fixed lint errors

* Fixed lint errors

* Do not panic and small fixes

* Do not panic when spiffe uri is missing some configuration values
* Remove environment variable ISTIO_SA_DOMAIN_CANONICAL
* Fix SNA typo
* Comment why testing for a kube registry

Co-authored-by: Holger Oehm <holger.oehm@sap.com>

* goimports-ed

Co-authored-by: Holger Oehm <holger.oehm@sap.com>

* Adapt test to getSpiffeId no longer panicing

Co-authored-by: Holger Oehm <holger.oehm@sap.com>

* Fix formatting

Co-authored-by: Holger Oehm <holger.oehm@sap.com>

* Fix lint errors and unit tests

Co-authored-by: Holger Oehm <holger.oehm@sap.com>

* Fix double declared imports

Co-authored-by: Ralf Pannemans <ralf.pannemans@sap.com>

* Fix more import related linting

Co-authored-by: Ralf Pannemans <ralf.pannemans@sap.com>
* Add retry to metrics check in TestTcpMetrics

* Small cleanup

* Fix typo
…#10889)

* Fix New Test Framework tests running in kubernetes environment

After the change istio#10562 Istio Deployment in new test framework started failing.
This PR tries to fix that

* Minor fix
* Add Pod and Node sources to Galley.

Also plumbing annotations and labels through from the source.

* adding access for pods/nodes to deployment.

* plumbing labels/annotations through Pilot
Signed-off-by: Kuat Yessenov <kuat@google.com>
@istio-testing
Copy link
Copy Markdown
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hklai

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

@googlebot
Copy link
Copy Markdown
Collaborator

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and have the pull request author add another comment and the bot will run again. If the bot doesn't comment, it means it doesn't think anything has changed.

@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 Jan 19, 2019
@hklai
Copy link
Copy Markdown
Contributor Author

hklai commented Jan 19, 2019

/test istio-unit-tests

@istio-testing
Copy link
Copy Markdown
Collaborator

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

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

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.

@hklai hklai 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 Jan 19, 2019
@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.)

@hklai hklai merged commit d93e9eb into istio:master Jan 19, 2019
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.