dataImportCronTemplates: Remove instancetype.kubevirt.io labels #2964

lyarwood · 2024-05-15T14:22:06Z

What this PR does / why we need it:

This metadata is now provided by the containerdisks project for these imports and used by CDI to later populate the required labels on the resulting PVCs:

$ podman image inspect quay.io/containerdisks/centos-stream:8 | jq '.[] | .Config.Env'
[
  "INSTANCETYPE_KUBEVIRT_IO_DEFAULT_INSTANCETYPE=u1.medium",
  "INSTANCETYPE_KUBEVIRT_IO_DEFAULT_PREFERENCE=centos.stream8"
]

$ ./cluster-up/kubectl.sh apply -f -<<EOF
apiVersion: cdi.kubevirt.io/v1beta1
kind: DataImportCron
metadata:
  annotations:
    cdi.kubevirt.io/storage.bind.immediate.requested: "true"
  name: centos-stream8-image-cron
spec:
  schedule: "0 */12 * * *"
  template:
    spec:
      source:
        registry:
          url: docker://quay.io/containerdisks/centos-stream:8
      storage:
        resources:
          requests:
            storage: 10Gi
  garbageCollect: Outdated
  managedDataSource: centos-stream8
EOF
[..]
./cluster-up/kubectl.sh get dv
selecting podman as container runtime
NAME                          PHASE       PROGRESS   RESTARTS   AGE
centos-stream8-d06927f5ae68   Succeeded   100.0%                61s
[..]
./cluster-up/kubectl.sh get pvc/centos-stream8-d06927f5ae68 -o json | jq .metadata.labels 
selecting podman as container runtime
{
  "alerts.k8s.io/KubePersistentVolumeFillingUp": "disabled",
  "app": "containerized-data-importer",
  "app.kubernetes.io/component": "storage",
  "app.kubernetes.io/managed-by": "cdi-controller",
  "cdi.kubevirt.io/dataImportCron": "centos-stream8-image-cron",
  "instancetype.kubevirt.io/default-instancetype": "u1.medium",
  "instancetype.kubevirt.io/default-preference": "centos.stream8"
}

$ ./cluster-up/kubectl.sh apply -k https://github.com/kubevirt/common-instancetypes.git
[..]
./cluster-up/virtctl.sh create vm --volume-import type:pvc,size:10Gi,src:default/centos-stream8-d06927f5ae68  --infer-instancetype --infer-preference --cloud-init-user-data $USER_DATA --name centos | ./cluster-up/kubectl.sh apply -f -
[..]
./cluster-up/kubectl.sh get vm/centos -o json | jq '.spec |.instancetype,.preference'
selecting podman as container runtime
{
  "kind": "virtualmachineclusterinstancetype",
  "name": "u1.medium",
  "revisionName": "centos-u1.medium-9af4814d-f78a-458c-b3d1-2b60d64bfcf6-1"
}
{
  "kind": "virtualmachineclusterpreference",
  "name": "centos.stream8",
  "revisionName": "centos-centos.stream8-7a5e492e-bac0-4e73-878a-aa88564d0803-1"
}

./cluster-up/kubectl.sh delete vms/centos

./cluster-up/virtctl.sh create vm --volume-datasource src:centos-stream8,name:centos,size:10Gi  --infer-instancetype --infer-preference --cloud-init-user-data $USER_DATA --name centos | ./cluster-up/kubectl.sh apply -f -
[..]
./cluster-up/kubectl.sh get vm/centos -o json | jq '.spec |.instancetype,.preference'
selecting podman as container runtime
{
  "kind": "virtualmachineclusterinstancetype",
  "name": "u1.medium",
  "revisionName": "centos-u1.medium-9af4814d-f78a-458c-b3d1-2b60d64bfcf6-1"
}
{
  "kind": "virtualmachineclusterpreference",
  "name": "centos.stream8",
  "revisionName": "centos-centos.stream8-7a5e492e-bac0-4e73-878a-aa88564d0803-1"
}

Reviewer Checklist

Reviewers are supposed to review the PR for every aspect below one by one. To check an item means the PR is either "OK" or "Not Applicable" in terms of that item. All items are supposed to be checked before merging a PR.

Jira Ticket:

https://issues.redhat.com/browse/CNV-41767

Release note:

NONE

This metadata is now provided by the containerdisks project for these imports and used by CDI to later populate the required labels on the resulting DV and PVCs: $ podman image inspect quay.io/containerdisks/centos-stream:8 | jq '.[] | .Config.Env' [ "INSTANCETYPE_KUBEVIRT_IO_DEFAULT_INSTANCETYPE=u1.medium", "INSTANCETYPE_KUBEVIRT_IO_DEFAULT_PREFERENCE=centos.stream8" ] Signed-off-by: Lee Yarwood <lyarwood@redhat.com>

kubevirt-bot · 2024-05-15T14:22:10Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

openshift-ci · 2024-05-15T14:22:10Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

sonarqubecloud · 2024-05-15T14:22:41Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.7% Duplication on New Code

See analysis details on SonarCloud

lyarwood · 2024-05-17T11:22:18Z

/cc @0xFelix

0xFelix

Looks good to me, thanks!

/lgtm

lyarwood · 2024-06-03T08:59:17Z

Thanks @0xFelix, @nunnatsa this should be ready to review now if you have time.

lyarwood · 2024-06-05T18:15:44Z

/retest-required

openshift-ci · 2024-06-05T20:37:28Z

@lyarwood: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/hco-e2e-operator-sdk-sno-aws	`f3434d6`	link	false	`/test hco-e2e-operator-sdk-sno-aws`
ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-aws	`f3434d6`	link	false	`/test hco-e2e-upgrade-prev-operator-sdk-sno-aws`
ci/prow/hco-e2e-upgrade-operator-sdk-sno-aws	`f3434d6`	link	false	`/test hco-e2e-upgrade-operator-sdk-sno-aws`
ci/prow/hco-e2e-kv-smoke-azure	`f3434d6`	link	true	`/test hco-e2e-kv-smoke-azure`
ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-aws	`f3434d6`	link	true	`/test hco-e2e-consecutive-operator-sdk-upgrades-aws`
ci/prow/hco-e2e-upgrade-operator-sdk-aws	`f3434d6`	link	true	`/test hco-e2e-upgrade-operator-sdk-aws`
ci/prow/hco-e2e-upgrade-prev-operator-sdk-aws	`f3434d6`	link	true	`/test hco-e2e-upgrade-prev-operator-sdk-aws`
ci/prow/hco-e2e-operator-sdk-aws	`f3434d6`	link	true	`/test hco-e2e-operator-sdk-aws`

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

hco-bot · 2024-06-06T10:07:56Z

hco-e2e-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-operator-sdk-aws
hco-e2e-upgrade-prev-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-aws
hco-e2e-upgrade-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-aws
hco-e2e-consecutive-operator-sdk-upgrades-azure lane succeeded.
/override ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-aws
hco-e2e-kv-smoke-gcp lane succeeded.
/override ci/prow/hco-e2e-kv-smoke-azure
hco-e2e-upgrade-operator-sdk-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-sno-aws
hco-e2e-upgrade-prev-operator-sdk-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-aws

hco-bot · 2024-06-06T10:08:02Z

hco-e2e-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-operator-sdk-aws
hco-e2e-upgrade-prev-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-aws
hco-e2e-upgrade-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-aws
hco-e2e-consecutive-operator-sdk-upgrades-azure lane succeeded.
/override ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-aws
hco-e2e-kv-smoke-gcp lane succeeded.
/override ci/prow/hco-e2e-kv-smoke-azure
hco-e2e-upgrade-operator-sdk-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-sno-aws
hco-e2e-upgrade-prev-operator-sdk-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-aws

kubevirt-bot · 2024-06-06T10:08:12Z

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-aws, ci/prow/hco-e2e-kv-smoke-azure, ci/prow/hco-e2e-operator-sdk-aws, ci/prow/hco-e2e-upgrade-operator-sdk-aws, ci/prow/hco-e2e-upgrade-operator-sdk-sno-aws, ci/prow/hco-e2e-upgrade-prev-operator-sdk-aws, ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-aws

In response to this:

hco-e2e-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-operator-sdk-aws
hco-e2e-upgrade-prev-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-aws
hco-e2e-upgrade-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-aws
hco-e2e-consecutive-operator-sdk-upgrades-azure lane succeeded.
/override ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-aws
hco-e2e-kv-smoke-gcp lane succeeded.
/override ci/prow/hco-e2e-kv-smoke-azure
hco-e2e-upgrade-operator-sdk-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-sno-aws
hco-e2e-upgrade-prev-operator-sdk-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-aws

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-sigs/prow repository.

kubevirt-bot · 2024-06-06T10:08:17Z

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-aws, ci/prow/hco-e2e-kv-smoke-azure, ci/prow/hco-e2e-operator-sdk-aws, ci/prow/hco-e2e-upgrade-operator-sdk-aws, ci/prow/hco-e2e-upgrade-operator-sdk-sno-aws, ci/prow/hco-e2e-upgrade-prev-operator-sdk-aws, ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-aws

In response to this:

hco-e2e-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-operator-sdk-aws
hco-e2e-upgrade-prev-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-aws
hco-e2e-upgrade-operator-sdk-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-aws
hco-e2e-consecutive-operator-sdk-upgrades-azure lane succeeded.
/override ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-aws
hco-e2e-kv-smoke-gcp lane succeeded.
/override ci/prow/hco-e2e-kv-smoke-azure
hco-e2e-upgrade-operator-sdk-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-sno-aws
hco-e2e-upgrade-prev-operator-sdk-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-aws

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-sigs/prow repository.

nunnatsa · 2024-06-10T10:42:22Z

/approve
/override-bot

kubevirt-bot · 2024-06-10T10:42:32Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nunnatsa

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:

~~OWNERS~~ [nunnatsa]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

nunnatsa · 2024-06-10T10:49:52Z

hco-e2e-operator-sdk-sno-azure lane passed
/override ci/prow/hco-e2e-operator-sdk-sno-aws

kubevirt-bot · 2024-06-10T10:49:56Z

@nunnatsa: Overrode contexts on behalf of nunnatsa: ci/prow/hco-e2e-operator-sdk-sno-aws

In response to this:

hco-e2e-operator-sdk-sno-azure lane passed
/override ci/prow/hco-e2e-operator-sdk-sno-aws

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-sigs/prow repository.

kubevirt-bot requested review from assafad and nunnatsa May 15, 2024 14:22

kubevirt-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 15, 2024

kubevirt-bot requested a review from 0xFelix May 17, 2024 11:22

0xFelix approved these changes May 28, 2024

View reviewed changes

kubevirt-bot assigned 0xFelix May 28, 2024

kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label May 28, 2024

lyarwood marked this pull request as ready for review June 3, 2024 08:58

kubevirt-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 3, 2024

kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 10, 2024

kubevirt-bot merged commit c70bb07 into kubevirt:main Jun 10, 2024
32 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dataImportCronTemplates: Remove instancetype.kubevirt.io labels #2964

dataImportCronTemplates: Remove instancetype.kubevirt.io labels #2964

lyarwood commented May 15, 2024 •

edited

Loading

kubevirt-bot commented May 15, 2024

openshift-ci bot commented May 15, 2024

sonarqubecloud bot commented May 15, 2024

lyarwood commented May 17, 2024

0xFelix left a comment

lyarwood commented Jun 3, 2024

lyarwood commented Jun 5, 2024

openshift-ci bot commented Jun 5, 2024

hco-bot commented Jun 6, 2024

hco-bot commented Jun 6, 2024

kubevirt-bot commented Jun 6, 2024

kubevirt-bot commented Jun 6, 2024

nunnatsa commented Jun 10, 2024

kubevirt-bot commented Jun 10, 2024

nunnatsa commented Jun 10, 2024

kubevirt-bot commented Jun 10, 2024

dataImportCronTemplates: Remove instancetype.kubevirt.io labels #2964

dataImportCronTemplates: Remove instancetype.kubevirt.io labels #2964

Conversation

lyarwood commented May 15, 2024 • edited Loading

kubevirt-bot commented May 15, 2024

openshift-ci bot commented May 15, 2024

sonarqubecloud bot commented May 15, 2024

Quality Gate passed

lyarwood commented May 17, 2024

0xFelix left a comment

Choose a reason for hiding this comment

lyarwood commented Jun 3, 2024

lyarwood commented Jun 5, 2024

openshift-ci bot commented Jun 5, 2024

hco-bot commented Jun 6, 2024

hco-bot commented Jun 6, 2024

kubevirt-bot commented Jun 6, 2024

kubevirt-bot commented Jun 6, 2024

nunnatsa commented Jun 10, 2024

kubevirt-bot commented Jun 10, 2024

nunnatsa commented Jun 10, 2024

kubevirt-bot commented Jun 10, 2024

lyarwood commented May 15, 2024 •

edited

Loading