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

Bug 2069654: Adding missing annotations to create VM from YAML #11518

Merged
merged 1 commit into from May 18, 2022

Conversation

avivtur
Copy link
Contributor

@avivtur avivtur commented May 18, 2022

Adding missing annotation for flavor os and workload

demo:

bz2069654-after.mp4

YAML file example:

apiVersion: kubevirt.io/v1
kind: VirtualMachine
metadata:
  name: vm-example
  labels:
    app: vm-example
    os.template.kubevirt.io/fedora35: 'true'
    flavor.template.kubevirt.io/small: 'true'
    vm.kubevirt.io/template: fedora-server-small
    workload.template.kubevirt.io/server: 'true'
  annotations:
    name.os.template.kubevirt.io/fedora35: Fedora 35
    description: VM example
  namespace: default
spec:
  running: false
  template:
    metadata:
      annotations:
        vm.kubevirt.io/flavor: small
        vm.kubevirt.io/os: fedora
        vm.kubevirt.io/workload: server
      labels:
        flavor.template.kubevirt.io/small: 'true'
        kubevirt.io/domain: vm-example
        kubevirt.io/size: small
        vm.kubevirt.io/name: vm-example
        os.template.kubevirt.io/fedora35: 'true'
        workload.template.kubevirt.io/server: 'true'
    spec:
      domain:
        cpu:
          cores: 1
          sockets: 1
          threads: 1
        devices:
          disks:
            - bootOrder: 1
              disk:
                bus: virtio
              name: containerdisk
            - disk:
                bus: virtio
              name: cloudinitdisk
          interfaces:
            - masquerade: {}
              name: default
              model: virtio
          networkInterfaceMultiqueue: true
          rng: {}
        resources:
          requests:
            memory: 1G
      hostname: vm-example
      networks:
        - name: default
          pod: {}
      terminationGracePeriodSeconds: 0
      volumes:
        - containerDisk:
            image: 'quay.io/containerdisks/fedora:35'
          name: containerdisk
        - cloudInitNoCloud:
            userData: |-
              #cloud-config
              password: fedora
              chpasswd: { expire: False }
          name: cloudinitdisk

Signed-off-by: Aviv Turgeman aturgema@redhat.com

Signed-off-by: Aviv Turgeman <aturgema@redhat.com>
@openshift-ci openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels May 18, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 18, 2022

@avivtur: This pull request references Bugzilla bug 2069654, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.11.0) matches configured target release for branch (4.11.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @gouyang

In response to this:

Bug 2069654: Adding missing annotations to create VM from YAML

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.

@openshift-ci openshift-ci bot added component/kubevirt Related to kubevirt-plugin approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 18, 2022
@yaacov
Copy link
Member

yaacov commented May 18, 2022

/lgtm

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

openshift-ci bot commented May 18, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: avivtur, yaacov

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 18, 2022

@avivtur: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 3704a04 into openshift:master May 18, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 18, 2022

@avivtur: All pull requests linked via external trackers have merged:

Bugzilla bug 2069654 has been moved to the MODIFIED state.

In response to this:

Bug 2069654: Adding missing annotations to create VM from YAML

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.

@yaacov
Copy link
Member

yaacov commented May 18, 2022

/cherry-pick release-4.10

@openshift-cherrypick-robot

@yaacov: #11518 failed to apply on top of branch "release-4.10":

Applying: Bug 2069654: Adding missing annotations to create VM from YAML
Using index info to reconstruct a base tree...
M	frontend/packages/kubevirt-plugin/src/models/templates/vm-yaml.ts
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/kubevirt-plugin/src/models/templates/vm-yaml.ts
CONFLICT (content): Merge conflict in frontend/packages/kubevirt-plugin/src/models/templates/vm-yaml.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 2069654: Adding missing annotations to create VM from YAML
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-4.10

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.

@yaacov
Copy link
Member

yaacov commented May 18, 2022

@avivtur hi,
I don't know why can't auot-backport :-(
can you make a manual backport ?

@yaacov
Copy link
Member

yaacov commented May 18, 2022

BZ for 4.10 - https://bugzilla.redhat.com/show_bug.cgi?id=2087932

@avivtur
Copy link
Contributor Author

avivtur commented May 18, 2022

@yaacov
Copy link
Member

yaacov commented May 18, 2022

both need to get backported

@yaacov
Copy link
Member

yaacov commented May 18, 2022

I'll try to automatically cherry pick this one again, after #11500 gets cherry-picked

@yaacov
Copy link
Member

yaacov commented May 19, 2022

/cherry-pick release-4.10

@openshift-cherrypick-robot

@yaacov: new pull request created: #11527

In response to this:

/cherry-pick release-4.10

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. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/kubevirt Related to kubevirt-plugin lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants