Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of docs - add service sync annotations and k8s service weight annotation into release/1.15.x #18039

Merged
merged 16 commits into from
Jul 6, 2023
+57 −14
Merged

Backport of docs - add service sync annotations and k8s service weight annotation into release/1.15.x #18039

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bb1ce5e
backport of commit e1bf4284947af9edd36e9d6f4d2c32e2d1fe9b14
Jul 6, 2023
b36d04e
backport of commit ddf214e638327cdf4b76d325d3c4194d6e26cee3
Jul 6, 2023
9db5a5d
backport of commit e41bd9c4e372c2b83d673d6f5c4afcfb44bdf14f
Jul 6, 2023
a191183
backport of commit b9cfc86e145d0b90474a1e13f5f02ce7599d9f0f
Jul 6, 2023
e4eaf1a
backport of commit 0ddf013d6c4e7d44c0c6dfff8fe0c56e5c4b6ca5
Jul 6, 2023
14ae227
backport of commit 1b0b513b05c1b14c9eb69f0e74f72fc7a0bba118
Jul 6, 2023
3b2a1bb
backport of commit 29442ad641b0de0df9753cdd207b9f15bc76e6e5
Jul 6, 2023
012cc70
backport of commit 5e7ddf5c7ef764e7df8fa4f6cd03431e89e8b441
Jul 6, 2023
ed76c6d
backport of commit f2b6fa7b4362ecde79b3b8a9752da6d2774d44d8
Jul 6, 2023
2c391a4
backport of commit 83b84a985a131c0ce2b10351f6dd5ca68cef5bf2
Jul 6, 2023
e1ba8e5
backport of commit 56d81738cc8143ddec27cc5134af23da4bfc2dd8
Jul 6, 2023
a3cfd29
backport of commit 0ab44f06c7249adc8a0ba43c369c66ae1f18e8c8
Jul 6, 2023
3b7f463
backport of commit 69c99fbccb711d32194eefd04419b854cacf8750
Jul 6, 2023
8d68299
backport of commit b79e1245c1bf765c97462f322c09965314317b0a
Jul 6, 2023
df25cb2
backport of commit fb1441976be9c78a2d658b094e178a0c0f75eb5e
Jul 6, 2023
1645e69
backport of commit 3b7b2a04242e17fc88296fc248ba491e697697c4
Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
backport of commit 29442ad
  • Loading branch information
David Yu authored Jul 6, 2023
commit 3b2a1bb325a6f1ab7ec9262b28babc4627428700
2 changes: 1 addition & 1 deletion website/content/docs/k8s/service-sync.mdx
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ service discovery, including hosted services like databases.

## Installation and configuration

~> Enabling both Service Mesh and Service Sync on the same Kubernetes services is not supported, as Service Mesh also registers Kubernetes service instances to Consul. Ensure that Catalog Sync is only enabled for namespaces and services that are not injected with the Consul sidecar for Service Mesh as described in [Sync Enable/Disable](/consul/docs/k8s/service-sync#sync-enable-disable).
~> Enabling both Service Mesh and Service Sync on the same Kubernetes services is not supported, as Service Mesh also registers Kubernetes service instances to Consul. Ensure that Service Sync is only enabled for namespaces and services that are not injected with the Consul sidecar for Service Mesh as described in [Sync Enable/Disable](/consul/docs/k8s/service-sync#sync-enable-disable).

The catalog sync feature deploys a long-running process which can
can run either inside or outside of a Kubernetes cluster. However, running this process within