Skip to content

Merging Istio-Proxy Readiness from master#8624

Merged
mandarjog merged 4 commits intoistio:release-1.0from
nmittler:readiness2
Sep 12, 2018
Merged

Merging Istio-Proxy Readiness from master#8624
mandarjog merged 4 commits intoistio:release-1.0from
nmittler:readiness2

Conversation

@nmittler
Copy link
Copy Markdown
Contributor

@nmittler nmittler commented Sep 11, 2018 •
edited
Loading

This includes a few commits related to the injector

Nathan Mittler added 4 commits September 11, 2018 09:20
@nmittler
Cleaning up inject test files (istio#7188)
6ec552d 
There are a lot of files and its confusing which files are used by
inject_test vs webhook_test. Splitting out the files into two
subdirectories under testdata/ to make it clear.  Making copies of
files that are shared.
@nmittler
Adding helper functions to simplify injection templates (istio#7737)
1d74e24 
* Adding helper functions to simplify injection templates

* addressing comments
@nmittler
More sidecar injector template cleanup (istio#7832)
7618f89 
* More sidecar injector template cleanup

* fixing
@nmittler
Add readiness probe for pilot agent. (istio#7465)
4068d25 
Overview of the changes:

- Adding new flag to the pilot agent "--statusPort". Defaults to 15003.

- Adding an HttpGet readiness probe to the pilot-agent
on the new status port. The agent (not Envoy) will
open this port. When receiving an HTTP GET on the readiness path,
the agent will probe Envoy, checking that it has received dynamic
listeners and clusters. If so, it's "ready".

- Poking a hole in the sidecar iptables for the new status port
(via the -d option).

- Updated both webhook and manual injection paths to generate the
readiness probe. A lot of changes here for the test files.
@nmittler nmittler requested a review from costinm September 11, 2018 17:11
@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Sep 11, 2018

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

If they are not already assigned, you can assign the PR to them by writing /assign @greghanson @nmittler 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

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

@costinm costinm requested a review from rshriram September 11, 2018 17:16
@mandarjog
Copy link
Copy Markdown
Contributor

mandarjog commented Sep 12, 2018

@nmittler since we don't want to change behaviour in the branch on upgrade, this should be opt-in.
Like we discussed, we will keep this commit as merge from master and add a separate PR to change defaults.

@mandarjog mandarjog merged commit 647598d into istio:release-1.0 Sep 12, 2018
@sebastien-prudhomme
Copy link
Copy Markdown
Contributor

sebastien-prudhomme commented Sep 20, 2018

This seems the origin of a problem in sidecar injection when using Helm chart in release-1.0 branch:

2018-09-20T09:53:10.018486Z	info	AdmissionReview for Kind=/v1, Kind=Pod Namespace=default Name= () UID=027fa3be-bcbb-11e8-896f-fa163e259550 Rfc6902PatchOperation=CREATE UserInfo={system:serviceaccount:kube-system:replicaset-controller a48388c6-b123-11e8-bad7-fa163e259550 [system:serviceaccounts system:serviceaccounts:kube-system system:authenticated] map[]}
2018-09-20T09:53:10.019069Z	info	http2: panic serving 10.42.2.0:54092: template: inject:10: function "annotation" not defined
goroutine 843 [running]:
net/http.(*http2serverConn).runHandler.func1(0xc420532408, 0xc4206e1faf, 0xc42013e000)
	/usr/local/go/src/net/http/h2_bundle.go:5753 +0x190
panic(0x12962c0, 0xc42037a230)
	/usr/local/go/src/runtime/panic.go:502 +0x229
text/template.Must(0x0, 0x157c940, 0xc42037a230, 0x0)
	/usr/local/go/src/text/template/helper.go:23 +0x54
istio.io/istio/pilot/pkg/kube/inject.injectionData(0xc420412600, 0x11c0, 0xc420104440, 0x40, 0xc420227988, 0xc4202278a0, 0xc4200ea960, 0xc4202721c0, 0x0, 0x0, ...)
	/workspace/go/src/istio.io/istio/pilot/pkg/kube/inject/inject.go:388 +0x2f8

@sebastien-prudhomme sebastien-prudhomme mentioned this pull request Sep 20, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@costinm costinm costinm approved these changes

@rshriram rshriram Awaiting requested review from rshriram

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@nmittler @istio-testing @mandarjog @sebastien-prudhomme @costinm @googlebot