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

Chart: Bump Kube Webhook CertGen. #12119

Merged
merged 1 commit into from
Oct 6, 2024
Merged

Chart: Bump Kube Webhook CertGen. #12119

merged 1 commit into from
Oct 6, 2024

Conversation

Gacko
Copy link
Member

@Gacko Gacko commented Oct 5, 2024

/triage accepted
/kind cleanup
/priority backlog
/cc @strongjz @rikatz @cpanato @tao12345666333

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. priority/backlog Higher priority than priority/awaiting-more-evidence. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/helm Issues or PRs related to helm charts approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 5, 2024
@Gacko
Copy link
Member Author

Gacko commented Oct 5, 2024

/cherry-pick release-1.10

@Gacko
Copy link
Member Author

Gacko commented Oct 5, 2024

/cherry-pick release-1.11

@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: once the present PR merges, I will cherry-pick it on top of release-1.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.10

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.

@Gacko
Copy link
Member Author

Gacko commented Oct 5, 2024

/hold

@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: once the present PR merges, I will cherry-pick it on top of release-1.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.11

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 do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 5, 2024
@netlify Netlify
Copy link

netlify bot commented Oct 5, 2024 •
edited
Loading

✅ Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit 4b98046
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/6701c88a823fa20008d9d4ca

strongjz
strongjz approved these changes Oct 5, 2024
View reviewed changes
Copy link
Member

@strongjz strongjz left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 5, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Gacko, strongjz

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

@Gacko
Copy link
Member Author

Gacko commented Oct 6, 2024

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 6, 2024
@k8s-ci-robot k8s-ci-robot merged commit 657393e into kubernetes:main Oct 6, 2024
32 of 33 checks passed
@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: #12119 failed to apply on top of branch "release-1.11":

Applying: Chart: Bump Kube Webhook CertGen.
Using index info to reconstruct a base tree...
M	charts/ingress-nginx/README.md
M	charts/ingress-nginx/values.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/ingress-nginx/values.yaml
Auto-merging charts/ingress-nginx/README.md
CONFLICT (content): Merge conflict in charts/ingress-nginx/README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Chart: Bump Kube Webhook CertGen.
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-1.11

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-infra-cherrypick-robot
Copy link
Contributor

@Gacko: #12119 failed to apply on top of branch "release-1.10":

Applying: Chart: Bump Kube Webhook CertGen.
Using index info to reconstruct a base tree...
M	charts/ingress-nginx/README.md
M	charts/ingress-nginx/values.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/ingress-nginx/values.yaml
Auto-merging charts/ingress-nginx/README.md
CONFLICT (content): Merge conflict in charts/ingress-nginx/README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Chart: Bump Kube Webhook CertGen.
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-1.10

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.

@Gacko Gacko deleted the hjtnu branch October 6, 2024 07:54
@Gacko Gacko mentioned this pull request Oct 6, 2024
Merged
@Gacko Gacko mentioned this pull request Oct 6, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@strongjz strongjz strongjz approved these changes

@cpanato cpanato Awaiting requested review from cpanato

@rikatz rikatz Awaiting requested review from rikatz

@tao12345666333 tao12345666333 Awaiting requested review from tao12345666333

Assignees

@strongjz strongjz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/helm Issues or PRs related to helm charts cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/backlog Higher priority than priority/awaiting-more-evidence. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Gacko @k8s-infra-cherrypick-robot @k8s-ci-robot @strongjz