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 vSphere client not using the provided custom CA bundle #969

Merged

Conversation

lsviben
Copy link
Contributor

@lsviben lsviben commented May 12, 2021

What this PR does / why we need it:
Fix the vSphere client issue where it doesnt use the provided custom CA bundle. Based on vmware/govmomi#1200.

Which issue(s) this PR fixes (optional, in fixes #<issue number> format, will close the issue(s) when PR gets merged):
Fixes #966

Optional Release Note:

Fixed vSphere client not using the provided custom CA bundle

@kubermatic-bot kubermatic-bot added 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 12, 2021
@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label May 12, 2021
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 2e82277838ade94dae0ab8c4d762a083d745eacd

@lsviben
Copy link
Contributor Author

lsviben commented May 12, 2021

/retest

@xrstf
Copy link
Contributor

xrstf commented May 12, 2021

/override pull-machine-controller-e2e-azure

@kubermatic-bot
Copy link
Contributor

@xrstf: Overrode contexts on behalf of xrstf: pull-machine-controller-e2e-azure

In response to this:

/override pull-machine-controller-e2e-azure

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.

@kron4eg
Copy link
Member

kron4eg commented May 12, 2021

/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg, lsviben

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 May 12, 2021
@kubermatic-bot kubermatic-bot merged commit bbc5f95 into kubermatic:master May 12, 2021
@lsviben
Copy link
Contributor Author

lsviben commented May 12, 2021

/cherry-pick release/v1.27

@kubermatic-bot
Copy link
Contributor

@lsviben: #969 failed to apply on top of branch "release/v1.27":

Applying: fix vSphere client not using the provided custom CA bundle
Using index info to reconstruct a base tree...
M	pkg/cloudprovider/provider/vsphere/client.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cloudprovider/provider/vsphere/client.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/provider/vsphere/client.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 vSphere client not using the provided custom CA bundle
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/v1.27

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. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. 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. 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.

Fix vSphere client certificate usage
4 participants