Merge pull request #19 from acend/philipona/second-interation-lab6

Unify tolerations onlywhen
acend · Sep 28, 2024 · 0dda725 · 0dda725
2 parents 9455c52 + 1996989
commit 0dda725
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 151 deletions.
diff --git a/content/en/docs/containerized-data-importer/alpine-vm.md b/content/en/docs/containerized-data-importer/alpine-vm.md
@@ -36,59 +36,14 @@ Block needed to reference the PVC as a disk and the `cloudinitdisk`:
 
 You will have to reference the `cloudinitdisk` as a second disk in `spec.template.spec.domain.devices.disks`.
 
-{{% onlyWhenNot tolerations %}}
-
-{{% details title="Task Hint" %}}
-Your VM definition should look like this:
-
-```yaml
-apiVersion: kubevirt.io/v1
-kind: VirtualMachine
-metadata:
-  name: {{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}-alpine
-spec:
-  running: false
-  template:
-    spec:
-      domain:
-        devices:
-          disks:
-            - name: alpinedisk
-              disk:
-                bus: virtio
-            - name: cloudinitdisk
-              disk:
-                bus: virtio
-          interfaces:
-            - name: default
-              masquerade: {}
-        resources:
-          requests:
-            memory: 256M
-      networks:
-        - name: default
-          pod: {}
-      volumes:
-        - name: alpinedisk
-          persistentVolumeClaim:
-            claimName: {{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}-alpinedisk
-        - name: cloudinitdisk
-          cloudInitNoCloud:
-            userData: |-
-              #cloud-config
-              password: {{% param "dummypwd" %}}
-              chpasswd: { expire: False }
-```
-{{% /details %}}
-
-{{% /onlyWhenNot %}}
-
 {{% onlyWhen tolerations %}}
 
 {{% alert title="Tolerations" color="warning" %}}
 Don't forget the `tolerations` from the setup chapter to make sure the VM will be scheduled on one of the baremetal nodes.
 {{% /alert %}}
 
+{{% /onlyWhen %}}
+
 {{% details title="Task Hint" %}}
 Your yaml should look like this:
 ```yaml
@@ -118,12 +73,12 @@ spec:
       networks:
         - name: default
           pod: {}
-      tolerations:
+      {{< onlyWhen tolerations >}}tolerations:
         - effect: NoSchedule
           key: baremetal
           operator: Equal
           value: "true"
-      volumes:
+      {{< /onlyWhen >}}volumes:
         - name: alpinedisk
           persistentVolumeClaim:
             claimName: {{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}-alpinedisk
@@ -136,8 +91,6 @@ spec:
 ```
 {{% /details %}}
 
-{{% /onlyWhen %}}
-
 
 ## {{% task %}} Create and start the VM
 

diff --git a/content/en/docs/initialize-vms-with-startup-scripts/cloud-init.md b/content/en/docs/initialize-vms-with-startup-scripts/cloud-init.md
@@ -204,12 +204,12 @@ spec:
       networks:
       - name: default
         pod: {}
-      tolerations:
+      {{< onlyWhen tolerations >}}tolerations:
         - effect: NoSchedule
           key: baremetal
           operator: Equal
           value: "true"
-      volumes:
+      {{< /onlyWhen >}}volumes:
         - name: containerdisk
           containerDisk:
             image: {{% param "fedoraCloudCDI" %}}
@@ -250,12 +250,12 @@ spec:
       networks:
       - name: default
         pod: {}
-      tolerations:
+      {{< onlyWhen tolerations >}}tolerations:
         - effect: NoSchedule
           key: baremetal
           operator: Equal
           value: "true"
-      volumes:
+      {{< /onlyWhen >}}volumes:
         - name: containerdisk
           containerDisk:
             image: {{% param "fedoraCloudCDI" %}}

diff --git a/content/en/docs/initialize-vms-with-startup-scripts/ignition.md b/content/en/docs/initialize-vms-with-startup-scripts/ignition.md
@@ -171,12 +171,12 @@ spec:
       networks:
       - name: default
         pod: {}
-      tolerations:
+      {{< onlyWhen tolerations >}}tolerations:
         - effect: NoSchedule
           key: baremetal
           operator: Equal
           value: "true"
-      volumes:
+      {{< /onlyWhen >}}volumes:
         - name: containerdisk
           containerDisk:
             image: {{% param "fedoraCoreOSCDI" %}}
@@ -216,12 +216,12 @@ spec:
       networks:
         - name: default
           pod: {}
-      tolerations:
+      {{< onlyWhen tolerations >}}tolerations:
         - effect: NoSchedule
           key: baremetal
           operator: Equal
           value: "true"
-      volumes:
+      {{< /onlyWhen >}}volumes:
         - name: containerdisk
           containerDisk:
             image: {{% param "fedoraCoreOSCDI" %}}

diff --git a/content/en/docs/instance-types-and-preferences/common-instancetypes.md b/content/en/docs/instance-types-and-preferences/common-instancetypes.md
@@ -335,95 +335,14 @@ Deploy two VMs with different instance types:
 * Deploy a cirros VM using an `o` class instancetype and the same preference.
   * rite the VM specification in `{{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}-o1-cirros.yaml`
 
-
-{{% onlyWhenNot tolerations %}}
-
-{{% details title="Solution" %}}
-`{{% param "labsfoldername" %}}/{{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}/vm_{{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}-u1-cirros.yaml` specification:
-```yaml
-apiVersion: kubevirt.io/v1
-kind: VirtualMachine
-metadata:
-  name: {{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}-u1-cirros
-spec:
-  running: false
-  instancetype:
-    kind: VirtualMachineClusterInstancetype
-    name: u1.nano
-  preference:
-    kind: VirtualMachineClusterPreference
-    name: cirros
-  template:
-    metadata:
-      labels:
-        kubevirt.io/size: nano
-        kubevirt.io/domain: {{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}-u1-cirros
-    spec:
-      domain:
-        devices:
-          disks:
-            - name: containerdisk
-            - name: cloudinitdisk
-          interfaces:
-            - name: default
-              masquerade: {}
-      networks:
-        - name: default
-          pod: {}
-      volumes:
-        - name: containerdisk
-          containerDisk:
-            image: quay.io/kubevirt/cirros-container-disk-demo
-        - name: cloudinitdisk
-          cloudInitNoCloud:
-            userDataBase64: SGkuXG4=
-```
-
-`{{% param "labsfoldername" %}}/{{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}/vm_{{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}-o1-cirros.yaml` specification:
-```yaml
-apiVersion: kubevirt.io/v1
-kind: VirtualMachine
-metadata:
-  name: {{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}-o1-cirros
-spec:
-  running: false
-  instancetype:
-    kind: VirtualMachineClusterInstancetype
-    name: o1.nano
-  preference:
-    kind: VirtualMachineClusterPreference
-    name: cirros
-  template:
-    metadata:
-      labels:
-        kubevirt.io/size: nano
-        kubevirt.io/domain: {{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}-o1-cirros
-    spec:
-      domain:
-        devices:
-          disks:
-            - name: containerdisk
-            - name: cloudinitdisk
-          interfaces:
-            - name: default
-              masquerade: {}
-      networks:
-        - name: default
-          pod: {}
-      volumes:
-        - name: containerdisk
-          containerDisk:
-            image: quay.io/kubevirt/cirros-container-disk-demo
-{{% /details %}}
-
-{{% /onlyWhenNot %}}
-
 {{% onlyWhen tolerations %}}
 
 {{% alert title="Tolerations" color="warning" %}}
 Don't forget the `tolerations` from the setup chapter to make sure the VM will be scheduled on one of the baremetal nodes.
 {{% /alert %}}
 
+{{% /onlyWhen %}}
+
 {{% details title="Solution" %}}
 `{{% param "labsfoldername" %}}/{{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}/vm_{{% param "labsubfolderprefix" %}}{{% param "labfoldernumber" %}}-u1-cirros.yaml` specification:
 ```yaml
@@ -456,12 +375,12 @@ spec:
       networks:
         - name: default
           pod: {}
-      tolerations:
+      {{< onlyWhen tolerations >}}tolerations:
         - effect: NoSchedule
           key: baremetal
           operator: Equal
           value: "true"
-      volumes:
+      {{< /onlyWhen >}}volumes:
         - name: containerdisk
           containerDisk:
             image: quay.io/kubevirt/cirros-container-disk-demo
@@ -501,12 +420,12 @@ spec:
       networks:
         - name: default
           pod: {}
-      tolerations:
+      {{< onlyWhen tolerations >}}tolerations:
         - effect: NoSchedule
           key: baremetal
           operator: Equal
           value: "true"
-      volumes:
+      {{< /onlyWhen >}}volumes:
         - name: containerdisk
           containerDisk:
             image: quay.io/kubevirt/cirros-container-disk-demo
@@ -515,7 +434,6 @@ spec:
             userDataBase64: SGkuXG4=
 ```
 
-{{% /onlyWhen %}}
 
 Apply and start both VMs with
 

diff --git a/content/en/docs/scaling-vms/vm-images.md b/content/en/docs/scaling-vms/vm-images.md
@@ -130,12 +130,12 @@ spec:
           requests:
             memory: 1Gi
       terminationGracePeriodSeconds: 0 
-      tolerations:
+      {{< onlyWhen tolerations >}}tolerations:
         - effect: NoSchedule
           key: baremetal
           operator: Equal
           value: "true"
-      volumes:
+      {{< /onlyWhen >}}volumes:
       - name: datavolumedisk
         dataVolume:
           name: fedora-cloud-nginx-base

diff --git a/content/en/docs/storage/mounting-storage.md b/content/en/docs/storage/mounting-storage.md
@@ -301,12 +301,12 @@ spec:
       networks:
         - name: default
           pod: {}
-      tolerations:
+      {{< onlyWhen tolerations >}}tolerations:
         - effect: NoSchedule
           key: baremetal
           operator: Equal
           value: "true"
-      volumes:
+      {{< /onlyWhen >}}volumes:
         - name: containerdisk
           containerDisk:
             image: quay.io/containerdisks/fedora:40