Update Machine Instances and Templates OCP+V by tux1980 · Pull Request #27 · stormshift/clusters

tux1980 · 2026-01-12T12:09:25Z

Creating Instances and Templates via Git Ops for OCP Virtualization

Update HyperConverged.yaml stormshift#24 >> Correction of the structure - The correct indentation in the right place.

tux1980

Please Review and approve (Adding Templates and Instance Types + adapting the kustomize file.
Thanks

…t.io directory

rbo

Please change the labels and base images. Details in comments.

rbo · 2026-01-12T16:38:27Z

isar-apps/ocp-v/templates/rhel10-ivyv2.yaml

🤔 This VM should fail? IvyBridge-v2 is not RHEL 10 ready... Because Ivy do not support x86-64 ABI v3: https://qemu-project.gitlab.io/qemu/system/qemu-cpu-models.html

Actually I deleted this yaml since it makes no sense days ago.... It shouldn't be there at all

rbo · 2026-01-20T11:25:14Z

isar-apps/ocp-v/instancetypes/rhel-broadwell-vmcit.yaml

+  memory:
+    guest: "4Gi"
+  nodeSelector:
+    usage-broadwell: "yes"


Who created the label at the node?

% oc get nodes -l usage-broadwell NAME STATUS ROLES AGE VERSION storm5 Ready storage-node,virt-node,worker 237d v1.33.6 storm6 Ready storage-node,virt-node,worker 237d v1.33.6

It's not defined here: https://github.com/stormshift/clusters/blob/main/configuration/overlays/isar/cluster-scope/Node/storm6.yaml

Additionally, why not use the kubevirt one: cpu-model.node.kubevirt.io/Broadwell-v4

oc get nodes -l cpu-model.node.kubevirt.io/Broadwell-v4=true NAME STATUS ROLES AGE VERSION storm5 Ready storage-node,virt-node,worker 237d v1.33.6 storm6 Ready storage-node,virt-node,worker 237d v1.33.6

Makes sense, using the kubevirt one.
cpu-model.node.kubevirt.io/Broadwell-v4=true

I# going to change that in the files, same for haswell

rbo · 2026-01-20T11:25:41Z

isar-apps/ocp-v/instancetypes/rhel-haswell-vmcit.yaml

+  memory:
+    guest: "4Gi"
+  nodeSelector:
+    usage-haswell: "yes"


Same as above. But different label: cpu-model.node.kubevirt.io/Haswell-v4

% oc get node -l cpu-model.node.kubevirt.io/Haswell-v4 NAME STATUS ROLES AGE VERSION storm2 Ready virt-node,worker 237d v1.33.6 storm3 Ready storage-node,virt-node,worker 237d v1.33.6 storm5 Ready storage-node,virt-node,worker 237d v1.33.6 storm6 Ready storage-node,virt-node,worker 237d v1.33.6

Yes, like you said

rbo · 2026-01-20T11:28:23Z

isar-apps/ocp-v/instancetypes/rhel10-dv-import.yaml

Why do we not use the DataSource:

% oc get datasource -n openshift-virtualization-os-images rhel10 NAME AGE rhel10 196d

It's based on registry.redhat.io/rhel10/rhel-guest-image:latest as well?

You mentioned it in the call, but I forgot it.

I wanted to have a new one since we had trouble with the metadata in the Original RHEL10 in connection with the SSP Operator. Furthermore, as you remember - we discussed to push all the customize stuff also in a new NS - "custom-os-images"

rbo · 2026-01-20T11:28:52Z

isar-apps/ocp-v/instancetypes/rhel9-ds-custom-broadwell.yaml

Same as above:

Why do we not use the DataSource:

% oc get datasource -n openshift-virtualization-os-images rhel10 NAME AGE rhel10 196d

above - the ds - we need another set of Metadata - look in the Issue 312 please, there I was suppose to document.

rbo · 2026-01-20T11:29:21Z

isar-apps/ocp-v/instancetypes/rhel9-ds-custom-haswell.yaml

Same as above but for rhel9

% oc get datasource -n openshift-virtualization-os-images rhel9 NAME AGE rhel9 2y66d

above - the ds - we need another set of Metadata - look in the Issue 312 please, there I was suppose to document.

rbo · 2026-01-20T11:29:33Z

isar-apps/ocp-v/instancetypes/rhel9-dv-import.yaml

Same as above but for rhel9

% oc get datasource -n openshift-virtualization-os-images rhel9 NAME AGE rhel9 2y66d

above - the ds - we need another set of Metadata - look in the Issue 312 please, there I was suppose to document.

isar-apps/ocp-v/instancetypes/secret-rhel.yaml

rbo · 2026-01-20T11:32:02Z

isar-apps/ocp-v/instancetypes/setup.yaml

Not needed if we use the provided rhel9/10 images.

We discussed to push all the customize stuff also in a new NS - "custom-os-images"

But I forgot what is custom on that image?

Maybe nothing, just wanted to make absolutely sure that we does not get any interference using images from the openshift-virtualization-os-images NS so that the SSP Operator maybe does not overwrite anything. So, we might change this again to the default image in the ds files:
source:
pvc:
name: rhel9-clean-base
namespace: custom-os-images

But we should keep all other resources in the new NS "custom-os-images"- apart from the dv's. simply for clean separation

I would prefer to use the datasource/rhel10 in openshift-virtualization-os-images

What is recommend from RH adding own images into openshift-virtualization-os-images or create own namespace?

We might as well put it in openshift-virtualization-os-images. This was just our call - where we wanted to strictly distinguish between custom images and default images - even so it is the same, just to able to differ them visually.

rbo · 2026-01-20T11:33:08Z

isar-apps/ocp-v/templates/rhel9-broadwell.yaml

+    from: 'rhel9-[a-z0-9]{16}'
+  - name: DATA_SOURCE_NAME
+    description: Name of the DataSource to clone
+    value: rhel9


BTW you do not use your own base images. You use the default one. 👍🏼 But then remove the copy of images.

Yes, for the templates we didn#t need extra metadata like in the Datasources/Boot Volumes. Is this causing any harm to anyone?;)

tux1980 added 18 commits January 8, 2026 12:09

Update HyperConverged.yaml

10e04eb

Update HyperConverged.yaml stormshift#24 >> Correction of the structure - The correct indentation in the right place.

Create instancetypes

dcb16b4

Delete isar-apps/ocp-v/instancetypes

c3503ad

Create README.md

50724de

Create README.md

62a1438

Create rhel-vmcit.yaml

9d447fb

Update rhel-vmcit.yaml

b48f3d5

Create rhel9-ds-custom.yaml

658bbcf

Create rhel9-dv-import.yaml

5e65b51

Create rhel10-ds-custom.yaml

56869f0

Create rhel10-dv-import.yaml

868568c

Create secret-rhel.yaml

8210393

Create rhel9-broadwell.yaml

baba93b

Create rhel9-haswellv4.yaml

261b30c

Create rhel10-broadwell.yaml

ddd39d2

Create rhel10-haswellv4.yaml

581bbb5

Create rhel10-ivyv2.yaml

84a8fad

Update kustomization.yaml

5620292

tux1980 commented Jan 12, 2026

View reviewed changes

tux1980 marked this pull request as ready for review January 12, 2026 12:14

tux1980 added 10 commits January 12, 2026 13:46

Update rhel-vmcit.yaml

5ef3f47

Update rhel10-ds-custom.yaml

70496fa

Update rhel9-ds-custom.yaml

1a98ba2

Update rhel10-ds-custom.yaml

6d394d3

Delete isar-apps/ocp-v/templates/rhel10-ivyv2.yaml

c8b44ef

Rename rhel-vmcit.yaml to rhel-haswell-vmcit.yaml

ec7d794

Create rhel-vmcit-broadwell.yaml

1833d51

Create rhel-vmcit-broadwell.yaml

8481e11

Delete isar-apps/ocp-v/instancetypes/apiVersion: instancetype.kubevir…

6076952

…t.io directory

Rename rhel-vmcit-broadwell.yaml to rhel-broadwell-vmcit.yaml

3eb987a

tux1980 added 26 commits January 19, 2026 11:31

Update rhel10-ds-custom.yaml

0bf8f2f

Update rhel9-ds-custom.yaml

706177b

Update rhel-broadwell-vmcit.yaml

e81deae

Update rhel-broadwell-vmcit.yaml

c05e78a

Update rhel-haswell-vmcit.yaml

cce2a51

Update rhel10-ds-custom.yaml

cd67bed

Update rhel9-ds-custom.yaml

e34ff0b

Update rhel-broadwell-vmcit.yaml

32b1843

Update rhel-haswell-vmcit.yaml

64ca573

Update rhel10-broadwell.yaml

7e531d5

Update rhel9-broadwell.yaml

dff561c

Update rhel10-haswellv4.yaml

c5251b7

Update and rename rhel9-haswellv4.yaml to rhel9-haswell.yaml

37e1a2e

Rename rhel10-haswellv4.yaml to rhel10-haswell.yaml

469cd57

Update rhel10-haswell.yaml

200d849

Create setup.yaml

f60707c

Update secret-rhel.yaml

1fba21b

Update rhel9-dv-import.yaml

3c82aae

Update rhel9-ds-custom.yaml

ee67f1f

Update rhel10-dv-import.yaml

a01f23f

Update rhel10-ds-custom.yaml

1b9bf3f

Rename rhel10-ds-custom.yaml to rhel10-ds-custom-haswell.yaml

adb1d12

Rename rhel9-ds-custom.yaml to rhel9-ds-custom-haswell.yaml

2ac6bb0

Create rhel9-ds-custom-broadwell.yaml

ac9ec6a

Create rhel10-ds-custom-broadwell.yaml

b35ab3f

Update rhel10-ds-custom-broadwell.yaml

0fbcb96

rbo requested changes Jan 20, 2026

View reviewed changes

Delete isar-apps/ocp-v/instancetypes/secret-rhel.yaml

f2689f8

Conversation

tux1980 commented Jan 12, 2026

Uh oh!

tux1980 left a comment

Choose a reason for hiding this comment

Uh oh!

rbo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tux1980 Jan 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

tux1980 Jan 20, 2026 •

edited

Loading