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

update in kubervirt rawconfig #1143

Merged
merged 6 commits into from
Mar 14, 2022
Merged

update in kubervirt rawconfig #1143

merged 6 commits into from
Mar 14, 2022

Conversation

sankalp-r
Copy link
Contributor

@sankalp-r sankalp-r commented Jan 3, 2022

Signed-off-by: Sankalp Rangare sankalprangare786@gmail.com

What this PR does / why we need it:
This PR updates kubeVirt's rawConfig and creation of VM using presets.

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

Special notes for your reviewer:

Optional Release Note:

Changing the config values for KubeVirt. This is a breaking change for KubeVirt cloud provider. 

@kubermatic-bot kubermatic-bot added release-note-none Denotes a PR that doesn't merit a release note. 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 3, 2022
@sankalp-r
Copy link
Contributor Author

/retest

@ahmedwaleedmalik
Copy link
Member

ahmedwaleedmalik commented Jan 4, 2022

@sankalp-r IMO this changeset introduces breaking changes for the existing kubevirt machine-deployments. I think we need to consider that as well, wdyt?

@sankalp-r sankalp-r marked this pull request as draft January 4, 2022 11:12
@kubermatic-bot kubermatic-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 4, 2022
@sankalp-r
Copy link
Contributor Author

@sankalp-r IMO this changeset introduces breaking changes for the existing kubevirt machine-deployments. I think we need to consider that as well, wdyt?

@ahmedwaleedmalik Yes these changes introduces breaking changes.
The idea is to fix machine-controller first, and then consume/update machine-controller version in KKP.

@sankalp-r sankalp-r marked this pull request as ready for review January 4, 2022 15:05
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 4, 2022
@sankalp-r
Copy link
Contributor Author

/retest

1 similar comment
@moadqassem
Copy link
Member

/retest

@kubermatic-bot kubermatic-bot added the sig/osm Denotes a PR or issue as being assigned to SIG OSM. label Jan 10, 2022
@sankalp-r
Copy link
Contributor Author

/retest

@moadqassem
Copy link
Member

@sankalp-r What is the status of this PR ?

@sankalp-r
Copy link
Contributor Author

@sankalp-r What is the status of this PR ?

As the UI for this change is not ready yet, can't proceed ahead.

This change needs UI changes as well, mentioned by Marcin:
#1113 (comment)

@sankalp-r sankalp-r added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 1, 2022
@sankalp-r sankalp-r marked this pull request as draft February 1, 2022 10:50
@sankalp-r sankalp-r marked this pull request as ready for review February 17, 2022 08:28
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 17, 2022
Labels: map[string]string{
"kubevirt.io/vm": machine.Name,
"kubevirt.io/vm": c.VirtualMachineName,
Copy link
Contributor

Choose a reason for hiding this comment

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

We are missing the labels coming from the Preset here (from line 372).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Preset labels are only required to be added in VirtualMachineInstanceTemplateSpec (line 414)

Copy link
Contributor

Choose a reason for hiding this comment

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

perfect.

This comment was marked as outdated.

@hdurand0710
Copy link
Contributor

/lgtm

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

LGTM label has been added.

Git tree hash: f613de30201f084e7594618fd57bebad56834b51

@sankalp-r
Copy link
Contributor Author

/retest

Signed-off-by: Sankalp Rangare <sankalprangare786@gmail.com>
@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 3, 2022
@hdurand0710
Copy link
Contributor

/hold cancel

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note-none Denotes a PR that doesn't merit a release note. labels Mar 8, 2022
@moadqassem
Copy link
Member

/hold this PR will be merged after the release of machine controller.

@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 Mar 8, 2022
DNSPolicy corev1.DNSPolicy
CPUs string
Memory string
Namespace string
Copy link
Contributor

Choose a reason for hiding this comment

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

As we will merge #1204 in the same release, we should now remove the Namespace.

Copy link
Contributor

Choose a reason for hiding this comment

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

I find it confusing to keep the Namespace here as it's not a configurable option any more..

pkg/cloudprovider/provider/kubevirt/provider.go Outdated Show resolved Hide resolved
pkg/cloudprovider/provider/kubevirt/provider.go Outdated Show resolved Hide resolved
pkg/cloudprovider/provider/kubevirt/provider.go Outdated Show resolved Hide resolved
DNSPolicy corev1.DNSPolicy
CPUs string
Memory string
Namespace string
Copy link
Contributor

Choose a reason for hiding this comment

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

I find it confusing to keep the Namespace here as it's not a configurable option any more..

Signed-off-by: Sankalp Rangare <sankalprangare786@gmail.com>
Labels: map[string]string{
"kubevirt.io/vm": machine.Name,
"kubevirt.io/vm": c.VirtualMachineName,

This comment was marked as outdated.

Signed-off-by: Sankalp Rangare <sankalprangare786@gmail.com>
// PrimaryDisk
type PrimaryDisk struct {
Disk
OsImage providerconfigtypes.ConfigVarString `json:"osImage,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to have here the same struct as in provider.go ?

@hdurand0710
Copy link
Contributor

/lgtm

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

LGTM label has been added.

Git tree hash: a936d56e7463d42d73f9a35493c1556416553140

@moadqassem
Copy link
Member

/hold cancel

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 11, 2022
@sankalp-r
Copy link
Contributor Author

/retest

Copy link
Member

@moadqassem moadqassem 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: moadqassem, sankalp-r

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 Mar 14, 2022
@sankalp-r
Copy link
Contributor Author

/retest

@kubermatic-bot kubermatic-bot merged commit 72f156a into kubermatic:master Mar 14, 2022
LittleFox94 pushed a commit to anexia-it/machine-controller that referenced this pull request Mar 16, 2022
* update in kubervirt rawconfig

Signed-off-by: Sankalp Rangare <sankalprangare786@gmail.com>

* rawConfig field renaming

Signed-off-by: Sankalp Rangare <sankalprangare786@gmail.com>

* update kubevirt provider Config

Signed-off-by: Sankalp Rangare <sankalprangare786@gmail.com>

* add namespace option in CloudConfig

Signed-off-by: Sankalp Rangare <sankalprangare786@gmail.com>

* create VM in dedicated ns

Signed-off-by: Sankalp Rangare <sankalprangare786@gmail.com>

* remove vmName from rawConfig

Signed-off-by: Sankalp Rangare <sankalprangare786@gmail.com>
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. 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow creation of MD from Virtual Machine Presets
5 participants