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

Jump to bottom

Backport of Catalog: Use EndpointSlice and propagate Kubernetes Topology information to synced consul service into release/1.2.x #3780

Merged
merged 15 commits into from
Mar 19, 2024
Merged

Backport of Catalog: Use EndpointSlice and propagate Kubernetes Topology information to synced consul service into release/1.2.x #3780

merged 15 commits into from
Mar 19, 2024

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #3693 to be assessed for backporting due to the inclusion of the label backport/1.2.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@jmurret
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "2aeb7252812cc1a991eca634fafbe68b3137d5ff", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.

Changes proposed in this PR

  • Switch to EndpointSlice vs Endpoints
  • Adds topology zone from Endpoint to Cosul service meta
  • Adds topology region from Endpoint's associated Node to Consul service meta
  • Adds get, list, and watch permissions for EndpointSlice to sync catalog's ClusterRole
  • Removes get, list, and watch permissions for Endpoints from sync catalog's ClusterRole

How I've tested this PR

  • Existing and new tests
  • Built and deployed catalog service to verify

How I expect reviewers to test this PR

  • Enable service sync and validate the registered instances have a listed meta entry for external-k8s-topology-zone and external-k8s-topology-region

Checklist

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/feat/zone-topology-meta/internally-above-piglet branch from eff612b to 982342d Compare March 19, 2024 20:58
@jukie @jmurret
Catalog: Use EndpointSlice and propagate Kubernetes Topology informat…
1160704 
…ion to synced consul service (#3693)

* Use EndpointSlice and propagate zone metadata to consul service

* Fix tests

* Add test for zone metadata

* Cleanup and changelog entry

* Fix clusterrole permissions and type on Informer

* Include region info for NodePort services

* Include topology region for all service types

* Update release note

* Fix tests

* fix sync-catalog-clusterrole and tests

* fix stash conflict

* adding endpoints permission back to sync catalog since it still uses it.

* Fix endpointslice map

* Fix topology region

* Remove region lookups, remove endpoints permissions, use pointers for endpointslice map

* Drop region test

---------

Co-authored-by: John Murret <john.murret@hashicorp.com>
@jmurret jmurret marked this pull request as ready for review March 19, 2024 21:08
@jmurret jmurret enabled auto-merge (squash) March 19, 2024 21:08
@jmurret
fix syncCatalog/ClusterRole: allows podsecuritypolicies access with g…
fe29ef7 
…lobal.enablePodSecurityPolicies=true failure due to duplicate section in resource
@jmurret jmurret merged commit 3f31a6c into release/1.2.x Mar 19, 2024
45 of 47 checks passed
@jmurret jmurret deleted the backport/feat/zone-topology-meta/internally-above-piglet branch March 19, 2024 23:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmurret jmurret jmurret approved these changes

Assignees

@jmurret jmurret

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@hc-github-team-consul-core @jmurret @jukie