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

📖 More generic explanation about issue getting kubeconfig on certain systems using Docker #6628

Merged
merged 1 commit into from
Jun 21, 2022

Conversation

RobinDeBock
Copy link
Contributor

@RobinDeBock RobinDeBock commented Jun 12, 2022

What this PR does / why we need it:
Following the comment of @sbueringer #6595 (comment) I have updated the documentation regarding an issue when using Docker (Desktop) on macOS, or when using Docker Desktop on Linux (Docker Enginer works fine).
The documentation only mentioned the fix for Mac users, now the more generic explanation targets all the appriopriate users.

Which issue(s) this PR fixes:
The issue is already closed, but resulted from the lack of this information: #6595

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jun 12, 2022

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: RobinDeBock / name: Robin De Bock (16a2c91)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Jun 12, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @RobinDeBock!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. 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-sigs/cluster-api 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
Copy link
Contributor

Hi @RobinDeBock. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 12, 2022
@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 Jun 12, 2022
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Thank you very much, a few nits

docs/book/src/clusterctl/developers.md Outdated Show resolved Hide resolved
docs/book/src/clusterctl/developers.md Outdated Show resolved Hide resolved
docs/book/src/user/quick-start.md Outdated Show resolved Hide resolved
@sbueringer
Copy link
Member

@RobinDeBock Thx can you please squash the commits?

@fabriziopandini
Copy link
Member

/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. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 13, 2022
@RobinDeBock
Copy link
Contributor Author

RobinDeBock commented Jun 13, 2022

@RobinDeBock Thx can you please squash the commits?

@sbueringer
I'm sorry, I'm new to this way of working. Could you explain how to squash commits already pushed to the remote?
I made these changes using the GitHub website and it made it into seperate commits.

@sbueringer
Copy link
Member

@RobinDeBock Thx can you please squash the commits?

@sbueringer I'm sorry, I'm new to this way of working. Could you explain how to squash commits already pushed to the remote? I made these changes using the GitHub website and it made it into seperate commits.

I don't think you can squash via the GitHub UI, usually this is done locally via git. Do you have git setup locally and are you familiar with it?

Otherwise it might be better if I squash for you and then you can take the time to learn more about Git (if you want to)

@RobinDeBock
Copy link
Contributor Author

@RobinDeBock Thx can you please squash the commits?

@sbueringer I'm sorry, I'm new to this way of working. Could you explain how to squash commits already pushed to the remote? I made these changes using the GitHub website and it made it into seperate commits.

I don't think you can squash via the GitHub UI, usually this is done locally via git. Do you have git setup locally and are you familiar with it?

Otherwise it might be better if I squash for you and then you can take the time to learn more about Git (if you want to)

I'm familiar with Git and got it installed locally. I just wanted to check before undoing these last commits and then squashing them, because it's quite impactful. Thanks for the suggestion though ;)

@sbueringer
Copy link
Member

sbueringer commented Jun 14, 2022

Okay good. Just asked because otherwise I would have to start somewhere else and not at "how to squash" :)

If you are on your local branch

# 5 is the number of commits you want to edit
git rebase -i HEAD~5
# An editor should open, mark commits that you want squashed as "squash"
# In your case mark every commit except the first one as squash
# then write+quit
git push --force

See: https://www.git-tower.com/learn/git/faq/git-squash (there's a gif below " If you mark one or more lines as "squash", they will be combined with the one above:")

Removed mentions of Windows as the fix isn't tested

Update docs/book/src/clusterctl/developers.md

Co-authored-by: Stefan Büringer <[email protected]>

Update docs/book/src/clusterctl/developers.md

Co-authored-by: Stefan Büringer <[email protected]>

Update docs/book/src/user/quick-start.md

Co-authored-by: Stefan Büringer <[email protected]>
@RobinDeBock
Copy link
Contributor Author

@sbueringer I pushed the changes you asked for, thanks!

@sbueringer
Copy link
Member

Thx!

/lgtm
/assign @fabriziopandini

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 20, 2022
@sbueringer
Copy link
Member

/approve

@sbueringer
Copy link
Member

/cherry-pick release-1.2

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.2

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.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 21, 2022
@k8s-ci-robot k8s-ci-robot merged commit 474bc46 into kubernetes-sigs:main Jun 21, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.2 milestone Jun 21, 2022
@k8s-infra-cherrypick-robot

@sbueringer: new pull request created: #6692

In response to this:

/cherry-pick release-1.2

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants