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

[release/v2.21] Include tunneling agent IP in apiserver's TLS cert SAN #11933

Merged

Conversation

rastislavs
Copy link
Contributor

What this PR does / why we need it:

This is a manual backport of #11932

Which issue(s) this PR fixes:

Fixes #11930

What type of PR is this?
/kind bug

Special notes for your reviewer:

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

Include tunneling agent IP in apiserver's TLS cert SANs

Documentation:

NONE

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>
@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. do-not-merge/code-freeze Indicates that a PR should not merge because it has not been approved for code freeze yet. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 20, 2023
@embik embik removed the do-not-merge/code-freeze Indicates that a PR should not merge because it has not been approved for code freeze yet. label Feb 24, 2023
Copy link
Member

@embik embik 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 Feb 24, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 760c9195f531505b01bfc22cb7c21afaed33b70f

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: embik, rastislavs

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 Feb 24, 2023
@embik embik added the cherry-pick-approved Indicates a PR has been approved by release managers. label Feb 24, 2023
@kubermatic-bot kubermatic-bot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Feb 24, 2023
@kubermatic-bot kubermatic-bot merged commit ac3ad07 into kubermatic:release/v2.21 Feb 24, 2023
@rastislavs
Copy link
Contributor Author

/cherrypick release/v2.20

@kubermatic-bot
Copy link
Contributor

@rastislavs: #11933 failed to apply on top of branch "release/v2.20":

Applying: Include tunneling agent IP in apiserver's TLS cert SAN
Using index info to reconstruct a base tree...
M	pkg/controller/seed-controller-manager/kubernetes/resources.go
M	pkg/resources/apiserver/tls-serving-certificate.go
M	pkg/resources/data.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/resources/data.go
CONFLICT (content): Merge conflict in pkg/resources/data.go
Auto-merging pkg/resources/apiserver/tls-serving-certificate.go
Auto-merging pkg/controller/seed-controller-manager/kubernetes/resources.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Include tunneling agent IP in apiserver's TLS cert SAN
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:

/cherrypick release/v2.20

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.

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. cherry-pick-approved Indicates a PR has been approved by release managers. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. kind/bug Categorizes issue or PR as related to a bug. 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/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants