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.

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

ingress: remove unused annotations #30733

Merged

Conversation

mhofstetter
Copy link
Member

The following Ingress annotations aren't actually used by any Ingress related logic.

  • ingress.cilium.io/tcp-keep-alive
  • ingress.cilium.io/tcp-keep-alive-idle
  • ingress.cilium.io/tcp-keep-probe-interval
  • ingress.cilium.io/tcp-keep-probe-max-failures
  • ingress.cilium.io/websocket

Support has been removed with #21386, while introducing the shared loadbalancer support.

It looks like the current logic only uses hard-coded defaults for these values: https://github.com/cilium/cilium/blob/main/operator/pkg/model/translation/envoy_listener.go#L103-L112

IMO we should remove the unused annotations and their functionality or add back the support for these annotations.

@mhofstetter mhofstetter added kind/cleanup This includes no functional changes. release-note/misc This PR makes changes that have no direct user impact. area/servicemesh GH issues or PRs regarding servicemesh feature/k8s-ingress labels Feb 13, 2024
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's clean it up, and good catch 👍

The following Ingress annotations aren't actually used by any Ingress related logic.

- `ingress.cilium.io/tcp-keep-alive`
- `ingress.cilium.io/tcp-keep-alive-idle`
- `ingress.cilium.io/tcp-keep-probe-interval`
- `ingress.cilium.io/tcp-keep-probe-max-failures`
- `ingress.cilium.io/websocket`

Support has been removed with cilium#21386, while
introducing the shared loadbalancer support.

Therefore, this commit uses the unused annotations and their functionality.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
@mhofstetter mhofstetter force-pushed the pr/mhofstetter/ingress-rem-tcp-keep-alive-annos branch from 221a183 to 7da2c00 Compare February 21, 2024 14:45
@mhofstetter mhofstetter marked this pull request as ready for review February 21, 2024 14:45
@mhofstetter mhofstetter requested review from a team as code owners February 21, 2024 14:45
@mhofstetter
Copy link
Member Author

/test

Copy link
Contributor

@learnitall learnitall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 21, 2024
@ti-mo ti-mo added this pull request to the merge queue Feb 22, 2024
Merged via the queue into cilium:main with commit 4a0c964 Feb 22, 2024
62 checks passed
@mhofstetter mhofstetter deleted the pr/mhofstetter/ingress-rem-tcp-keep-alive-annos branch February 22, 2024 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/servicemesh GH issues or PRs regarding servicemesh feature/k8s-ingress kind/cleanup This includes no functional changes. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants