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 convert-kubeconfig command not generating a SA token #11197

Merged
merged 1 commit into from Oct 11, 2022

Conversation

xrstf
Copy link
Contributor

@xrstf xrstf commented Oct 11, 2022

What this PR does / why we need it:
This is a follow-up to #11190, applying the same simple fix to the convert-kubeconfig subcommand in the KKP installer.

/kind bug

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

Fix `convert-kubeconfig` installer command not generating a SA token

Documentation:

NONE

@kubermatic-bot kubermatic-bot added docs/none Denotes a PR that doesn't need documentation (changes). kind/bug Categorizes issue or PR as related to a bug. 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. labels Oct 11, 2022
@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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. labels Oct 11, 2022
@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 11, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 3222570ed0b32783745479528b424a53de12c24b

@xrstf
Copy link
Contributor Author

xrstf commented Oct 11, 2022

/retest

@xrstf xrstf closed this Oct 11, 2022
@xrstf xrstf reopened this Oct 11, 2022
@xrstf
Copy link
Contributor Author

xrstf commented Oct 11, 2022

/retest

Prow, you home, go drunk!

@kubermatic-bot kubermatic-bot merged commit cca384d into kubermatic:master Oct 11, 2022
@xrstf xrstf deleted the fix-convert-kubeconfig branch October 11, 2022 18:03
@xrstf
Copy link
Contributor Author

xrstf commented Oct 11, 2022

/cherrypick release/v2.21

@xrstf
Copy link
Contributor Author

xrstf commented Oct 11, 2022

/cherrypick release/v2.20

@kubermatic-bot
Copy link
Contributor

@xrstf: new pull request created: #11199

In response to this:

/cherrypick release/v2.21

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.

@kubermatic-bot
Copy link
Contributor

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

Applying: fix convert-kubeconfig command not generating a SA token
Using index info to reconstruct a base tree...
M	cmd/kubermatic-installer/cmd_convert_kubeconfig.go
M	pkg/controller/master-controller-manager/seed-proxy/resources.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/master-controller-manager/seed-proxy/resources.go
Auto-merging cmd/kubermatic-installer/cmd_convert_kubeconfig.go
CONFLICT (content): Merge conflict in cmd/kubermatic-installer/cmd_convert_kubeconfig.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 fix convert-kubeconfig command not generating a SA token
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.

@embik
Copy link
Member

embik commented Oct 17, 2022

@xrstf I think this still needs a manual 2.20 cherry-pick.

@embik
Copy link
Member

embik commented Oct 17, 2022

Does this need a 2.19 backport as well?

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/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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants