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

Fix custom-headers annotation does not apply the configuration automatically #11709

Open
wants to merge 7 commits into
base: main
Choose a base branch
from

Conversation

jgoelen
Copy link

@jgoelen jgoelen commented Jul 31, 2024

What this PR does / why we need it:

It fixes an open issue #11680.
The problem extends to the response headers not reflecting updates made to the ConfigMap's contents. This limitation stems from the fact that the Ingress object remains unmodified, making it impossible to address through code changes alone. However, a straightforward solution exists: adding a checksum annotation on the Ingress that includes a hash of the ConfigMap's content. This approach would effectively trigger the necessary updates.

kind: Ingress
metadata:
  name: podinfo-ingress
  annotations:
    nginx.ingress.kubernetes.io/custom-headers: custom-security-headers
    checksum/config: cfe9d9d1a364866309f498c8fd07a6208ac5c68aaefa15212e50585fca9cbebe
spec:
...

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • CVE Report (Scanner found CVE and adding report)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

Fixes #11680

How Has This Been Tested?

Add extra config to test manifests used by types_equals_test.go.
Manual testing.

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • [X ] I've read the CONTRIBUTION guide
  • I have added unit and/or e2e tests to cover my changes.
  • All new and existing tests passed.

Copy link

linux-foundation-easycla bot commented Jul 31, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jul 31, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @jgoelen!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority labels Jul 31, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @jgoelen. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 31, 2024
Copy link

netlify bot commented Jul 31, 2024

Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit 3f69fe9
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/675b02ad6442f500082d264a

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jgoelen
Once this PR has been reviewed and has the lgtm label, please assign gacko for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

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

@k8s-ci-robot k8s-ci-robot requested review from puerco and strongjz July 31, 2024 12:08
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jul 31, 2024
@PavelGloba
Copy link

@longwuyuan can it be reviewed by someone? Looks like a small change

@longwuyuan
Copy link
Contributor

longwuyuan commented Aug 16, 2024 via email

@PavelGloba
Copy link

Maybe you can post complete detailed kubectl describe and curl outputs of before and after for readers. Use the make dev-env and FOCUS test from here https://kubernetes.github.io/ingress-nginx/developer-guide/getting-started/#testing

On Fri, 16 Aug, 2024, 18:56 PavelGloba, @.> wrote: @longwuyuan https://github.com/longwuyuan can it be reviewed by someone? Looks like a small change — Reply to this email directly, view it on GitHub <#11709 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/ABGZVWT4NINYZA4V7HV6NE3ZRX4Y7AVCNFSM6AAAAABLYKVJF6VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEOJTGUYDSMJRHA . You are receiving this because you were mentioned.Message ID: @.>

@jgoelen

@jgoelen
Copy link
Author

jgoelen commented Aug 19, 2024

@longwuyuan @PavelGloba

As requested, I've created a local test setup with detailed test scenarios, which you can find in this repository:

https://github.com/jgoelen/ingress-nginx-custom-headers-test

These should allow you to easily reproduce the tests in your local environment.

I hope this facilitates a quicker review of the PR.

Copy link

github-actions bot commented Oct 4, 2024

This is stale, but we won't close it automatically, just bare in mind the maintainers may be busy with other tasks and will reach your issue ASAP. If you have any question or request to prioritize this, please reach #ingress-nginx-dev on Kubernetes Slack.

@github-actions github-actions bot added the lifecycle/frozen Indicates that an issue or PR should not be auto-closed due to staleness. label Oct 4, 2024
@k8s-triage-robot
Copy link

The lifecycle/frozen label can not be applied to PRs.

This bot removes lifecycle/frozen from PRs because:

  • Commenting /lifecycle frozen on a PR has not worked since March 2021
  • PRs that remain open for >150 days are unlikely to be easily rebased

You can:

  • Rebase this PR and attempt to get it merged
  • Close this PR with /close

Please send feedback to sig-contributor-experience at kubernetes/community.

/remove-lifecycle frozen

@k8s-ci-robot k8s-ci-robot removed the lifecycle/frozen Indicates that an issue or PR should not be auto-closed due to staleness. label Oct 4, 2024
@gavinkflam
Copy link

@jgoelen Why don't you implement an automated e2e tests? There are plenty of examples in the repository.

@qvalentin
Copy link

Hi @gavinkflam I added the missing e2e tests in #12479.

@strongjz strongjz removed the request for review from puerco December 12, 2024 15:33
@strongjz
Copy link
Member

/kind bug
/triage accepted
/priority backlog
/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. kind/bug Categorizes issue or PR as related to a bug. triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority labels Dec 12, 2024
@strongjz
Copy link
Member

/tide merge-method-squash

@strongjz strongjz added this to the release-1.12 milestone Dec 12, 2024
@strongjz strongjz requested a review from Gacko December 12, 2024 15:36
@strongjz
Copy link
Member

@Gacko I added this to 1.12 as a bug fix, if you think we shouldn't please move it to 1.13

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/backlog Higher priority than priority/awaiting-more-evidence. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

custom-headers annotation does not apply the configuration automatically
8 participants