Merge collab-gcp-identity with master . #6304
Conversation
Signed-off-by: Kuat Yessenov <kuat@google.com>
* Add mixer cluster configuration to mixer CR jobs * fix config map * Add new service account and binding for cr job * Fix destination rule
For istio#5769. Signed-off-by: Piotr Sikora <piotrsikora@google.com>
* Fixing locks for add/delete/read * Adding Unit tests * Addressing comments * Addressing comments * Change locking model * Change locking model
…nationrules (istio#5709) * Also remove virtualservices, gateways and destinationrules (istio#5703) * Updated following review comments
Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
* context paths corrected * configs need to stay sorted
…aph … (istio#5490) This is workaround because servicegraph haven't the health check path. But the ingress-gce needs the readinessProbe path that returns 200 status, so we should get 'generic JSON serialization' body and 200(httpOK) status.
Defered funcs won't be called when os.Exit() is invoked in the same method.
* Revert "Include helm chart option for installing jaeger specific services (istio#5670)" This reverts commit 6dbbaca. * Revert "Use jaeger for zipkin service (istio#5656)" This reverts commit 7efb91d.
…stio#5672) * Initial Code load * Addressing unit test failure * Fixing initial controller * Addressing comments * Fixing unit tests * Fixing lint * Addressing comments
* use namespace as chart name so it is unique * use proxyv2 as default * updating few values yaml in hope to get test passing * add a missing proxyv2 config * getting back needed proxyv2 to get test passing * getting back needed proxyv2 to get test passing * use proxy for old ingress
…istio#5800) * force users to use injectConfigMapName or injectConfigFile * set ISTIOCTL_USE_BUILTIN_DEFAULTS in Makefile, so tests continue to work * set defaults for injectconfigmap * ensure that tag and hub are specified when using builins
* Replace join implementation * Update dump_kubernetes.sh
* Fix pilot_cli debug tool to work with EDS * Clean up unused code.
This reverts commit 0e633b3.
* disable full wildcard for mesh Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com> * updates * more bug fixes and proxy sha update Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com> * fixes Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com> * undo some changes in gateway Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com> * patching Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com> * no sni hosts for plain text listeners in gateway Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com> * Do not set SNI for internal services Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com> * tcp fix Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
…o#5525) * Add handling of ISTIO_MUTUAL when generating cluster config. * Remove the inferences from authn policy. Also remove the accidetally included port level DR policy istio#5055. * respect the global configmap by changing how to build defaultTrafficPolicy * Fill in TLSSettings in advance to avoid plumbing service account. * remove dead code. * Skip override for external and support port level settings. * update dependency * restore port level settings. * remove redudant call plugins loop. * Check fields to avoid null pointer reference. * fix the lint. * Move down the H2 header since ISTIO_MUTUAL to avoid NPR. * Change cluster.go to remove TLS when it's DISABLE mode. * Add the DestinationRule to make the test passing. * Add DestinationRule to pass TestAuthnJWT test. * Remove obsolete todo * Only add DestinationRule when auth is enabled for TestAuthNJwt. * Move configmap check into the branch when no DR is available. * Remove the NIR code in cluster.go. * Add H2 back and change disable-egress-mtls.yaml for gateway. * Fix ingress e23 tests * Correct template * Apply DR template for TestRoutes. * Fix TestRouteFaultInjection * Add tls ISTIO_MUTUAL for mixer destination rules. * fix the lint in cluster.go. * Rename the fillTemplate and clarify the comments. * Change the ISTIO_MUTUAL for grpc-mixer-mtls port, instead of everything. * Wrap around adding DR before checking v1alpha3. * fix the lint and change istio-telemetry port tls. * Add ISTIO_MUTUAL in route-rule-all-v1. * Branching the route-rule-all-v1-mtls when auth_enable=true for prow test. * copy the kube/route-rule-all-v1-mtls.
Co-authored-by: Nancy Hsieh <nhsieh@pivotal.io>
* Bug fixes in SNI forwarding for external services Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com> * lint Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com> * fix istioctl Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com> * nil pointer fix Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
* Add mixer config info into per route * Skip gateway 503 test
|
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 |
|
/lgtm |
|
Can we merge from istio:master to istio:collab-gcp-identity directly? |
|
I tried that once, but that not works well. Because people are constantly
pushing new commits into istio:master, which removes the LGTM label and
invalidate the presubmit run.
…On Thu, Jun 14, 2018 at 2:13 PM Tao Li ***@***.***> wrote:
Can we merge from istio:master to istio:collab-gcp-identity directly?
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#6304 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ABlbh-6UrQO2U5DuNm9CKYmIcxqJs7agks5t8tITgaJpZM4UoqW5>
.
|
|
But I can manually |
|
okay, /lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: incfly, quanjielin, wattli 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:
Approvers can indicate their approval by writing |
|
|
|
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.) |
|
https://screenshot.googleplex.com/QCuZPoqW3Cp, seems github does not recognize this merge, any ideas? |
|
I've did some experiments at https://github.com/incfly/github-mergeflow It turns out we should use "merge with all commits", not "Squash and merge" when merging master into To fix the current situation, we can revert this and create another merge using "merge with all commits." @hklai Could you comment on above proposal? |
|
Yes merge commit is preferred. And only admin can do it. My question however is whether it is safe to merge these changes to master now? Are they needed for 1.0? |
|
@hklai Thanks, but we're supposed have the permission to merge commit in collab-gcp-identity right? We don't need to merge to master at this point, this is just to prepare for the future. Will do
|
|
It is a repo-wide setting, not per branch. It is disabled currently to prevent people from populating the codebase. And normally I enable the setting, perform a commit merge, and disable it again,
What is the risk however? If it is high and it is not needed, we probably should defer it. |
We don't have concrete schedule to merge back to master, but it will happen eventually. |
No description provided.