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

Update to nginx-ingress-controller v1.9.3 #12712

Merged
merged 2 commits into from
Oct 12, 2023

Conversation

embik
Copy link
Member

@embik embik commented Oct 12, 2023

What this PR does / why we need it:
nginx-ingress-controller just released v1.9.3. We haven't bumped it in a while, so let's do that.

Which issue(s) this PR fixes:

Fixes #

What type of PR is this?
/kind chore

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

Update nginx-ingress-controller to v1.9.3 (fixes CVE-2023-44487, HTTP/2 rapid reset attack)

Documentation:

NONE

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
@kubermatic-bot kubermatic-bot added docs/none Denotes a PR that doesn't need documentation (changes). release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. kind/chore Updating grunt tasks etc; no production code changes. sig/app-management Denotes a PR or issue as being assigned to SIG App Management. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 12, 2023
@embik embik requested a review from xrstf October 12, 2023 14:28
@embik embik self-assigned this Oct 12, 2023
Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
@kubermatic-bot kubermatic-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 12, 2023
Copy link
Contributor

@xrstf xrstf left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 12, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 1e880bca86451e4ced0c40209d49dcd1becf0aa2

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xrstf

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 12, 2023
@kubermatic-bot kubermatic-bot merged commit 0275251 into kubermatic:main Oct 12, 2023
5 checks passed
@kubermatic-bot kubermatic-bot added this to the KKP 2.24 milestone Oct 12, 2023
@embik embik deleted the nginx-ingress-1.9.3 branch October 13, 2023 06:06
@embik
Copy link
Member Author

embik commented Oct 13, 2023

/cherry-pick release/v2.23

@kubermatic-bot
Copy link
Contributor

@embik: #12712 failed to apply on top of branch "release/v2.23":

Applying: Update to nginx-ingress-controller v1.9.3
Using index info to reconstruct a base tree...
M	charts/nginx-ingress-controller/values.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/nginx-ingress-controller/values.yaml
Applying: Update charts/nginx-ingress fixtures
Using index info to reconstruct a base tree...
M	charts/nginx-ingress-controller/test/default.yaml.out
M	charts/nginx-ingress-controller/test/values.example.ce.yaml.out
M	charts/nginx-ingress-controller/test/values.example.ee.yaml.out
Falling back to patching base and 3-way merge...
Auto-merging charts/nginx-ingress-controller/test/values.example.ee.yaml.out
CONFLICT (content): Merge conflict in charts/nginx-ingress-controller/test/values.example.ee.yaml.out
Auto-merging charts/nginx-ingress-controller/test/values.example.ce.yaml.out
CONFLICT (content): Merge conflict in charts/nginx-ingress-controller/test/values.example.ce.yaml.out
Auto-merging charts/nginx-ingress-controller/test/default.yaml.out
CONFLICT (content): Merge conflict in charts/nginx-ingress-controller/test/default.yaml.out
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Update charts/nginx-ingress fixtures
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release/v2.23

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/test-infra repository.

embik added a commit to embik/kubermatic that referenced this pull request Oct 13, 2023
…#12712)

* Update to nginx-ingress-controller v1.9.3

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

* Update charts/nginx-ingress fixtures

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

---------

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
kubermatic-bot pushed a commit that referenced this pull request Oct 15, 2023
…12714)

* [release/v2.23] Update to nginx-ingress-controller v1.9.3 (#12712)

* Update to nginx-ingress-controller v1.9.3

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

* Update charts/nginx-ingress fixtures

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

---------

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

* restore default namespace (Helm behaviour drift)

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

* Render values with Helm v3.12.2

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

* last attempt at agreeing with helm ...

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>

---------

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/chore Updating grunt tasks etc; no production code changes. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/app-management Denotes a PR or issue as being assigned to SIG App Management. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants