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

Refactor handling of Kubeconfig for KubeVirt #1301

Merged
merged 1 commit into from
May 23, 2022
Merged

Refactor handling of Kubeconfig for KubeVirt #1301

merged 1 commit into from
May 23, 2022

Conversation

ahmedwaleedmalik
Copy link
Member

Signed-off-by: Waleed Malik [email protected]

What this PR does / why we need it:
This PR intends to make the handling of Kubeconfig for KubeVirt consistent between KKP and machine-controller.

  • When Kubeconfig is specified directly in the CR then it should be base64 encoded.
  • If referred using a secret or environment variable. Then it can either be an unencoded string or base64 encoded.

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

Special notes for your reviewer:

Optional Release Note:

Improve handling of Kubeconfig for KubeVirt

@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. labels May 20, 2022
@ahmedwaleedmalik ahmedwaleedmalik self-assigned this May 20, 2022
@kubermatic-bot kubermatic-bot added sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. sig/osm Denotes a PR or issue as being assigned to SIG OSM. 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. labels May 20, 2022
@ahmedwaleedmalik
Copy link
Member Author 

+ apt-get -y install buildah
Reading package lists...
Building dependency tree...
Reading state information...
E: Unable to locate package buildah

🤷‍♂️

@hdurand0710
Copy link
Contributor

/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: f1f50b899d336059a750f9122cf605f9cc139e2f

mfranczy
mfranczy approved these changes May 20, 2022
View reviewed changes
Copy link
Contributor

@mfranczy mfranczy left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik, mfranczy

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-triage-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs

Review the full test history

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@ahmedwaleedmalik
Copy link
Member Author

/hold

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 20, 2022
@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label May 20, 2022
@ahmedwaleedmalik
Copy link
Member Author

/unhold

@kubermatic-bot kubermatic-bot removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels May 20, 2022
@ahmedwaleedmalik
Copy link
Member Author

/retest

1 similar comment
@ahmedwaleedmalik
Copy link
Member Author

/retest

@ahmedwaleedmalik
Copy link
Member Author

/test pull-machine-controller-e2e-kubevirt

@ahmedwaleedmalik
Copy link
Member Author

/cherrypick release/v1.43

@kubermatic-bot
Copy link
Contributor

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

In response to this:

/cherrypick release/v1.43

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.

@ahmedwaleedmalik
Copy link
Member Author

@mfranczy @hdurand0710 would need the LGTM again. ✌️

@hdurand0710
Copy link
Contributor

/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label May 23, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4741b8f8393f28664b4ac98be71a0ed7476fa183

@kubermatic-bot kubermatic-bot merged commit a04da9b into kubermatic:master May 23, 2022
@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: #1301 failed to apply on top of branch "release/v1.43":

Applying: Refactor handling of kubeconfig for kubevirt
Using index info to reconstruct a base tree...
M	examples/kubevirt-machinedeployment.yaml
M	pkg/cloudprovider/provider/kubevirt/provider.go
M	test/e2e/provisioning/all_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/provisioning/all_e2e_test.go
Auto-merging pkg/cloudprovider/provider/kubevirt/provider.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/provider/kubevirt/provider.go
Auto-merging examples/kubevirt-machinedeployment.yaml
CONFLICT (content): Merge conflict in examples/kubevirt-machinedeployment.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Refactor handling of kubeconfig for kubevirt
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/v1.43

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.

@ahmedwaleedmalik ahmedwaleedmalik deleted the kubevirt-kubeconfig branch May 23, 2022 09:01
@ahmedwaleedmalik ahmedwaleedmalik mentioned this pull request May 23, 2022
Merged
@mfranczy
Copy link
Contributor

/cherrypick release/v1.42

@kubermatic-bot
Copy link
Contributor

@mfranczy: #1301 failed to apply on top of branch "release/v1.42":

Applying: Refactor handling of kubeconfig for kubevirt
Using index info to reconstruct a base tree...
M	examples/kubevirt-machinedeployment.yaml
M	pkg/cloudprovider/provider/kubevirt/provider.go
M	test/e2e/provisioning/all_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/provisioning/all_e2e_test.go
Auto-merging pkg/cloudprovider/provider/kubevirt/provider.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/provider/kubevirt/provider.go
Auto-merging examples/kubevirt-machinedeployment.yaml
CONFLICT (content): Merge conflict in examples/kubevirt-machinedeployment.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Refactor handling of kubeconfig for kubevirt
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/v1.42

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.

This was referenced Jul 13, 2022
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mfranczy mfranczy Awaiting requested review from mfranczy

@hdurand0710 hdurand0710 Awaiting requested review from hdurand0710

Assignees

@ahmedwaleedmalik ahmedwaleedmalik

@mfranczy mfranczy

@hdurand0710 hdurand0710

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. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. sig/osm Denotes a PR or issue as being assigned to SIG OSM. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ahmedwaleedmalik @hdurand0710 @kubermatic-bot @kubermatic-triage-bot @mfranczy