Merge branch '5-allow-node-selection' into 'main'

Adding nodePlacement configs for KubeVirt infra and workloads pods.

Closes #5

See merge request platform-one/big-bang/apps/third-party/kubevirt!31

CHANGELOG.md

@@ -21,3 +21,7 @@ Format: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Pipeline fixes
 - Initial Chart creation
 - Adding imagePullSecret injection for kubevirt operator and dynamic resources.
+
+## [0.0.1-bb.3]
+### Added
+- Adding nodePlacement configurations for infra and workloads KubeVirt configs.

README.md

 # bigbang-kubevirt
 
-![Version: 0.0.1-bb.2](https://img.shields.io/badge/Version-0.0.1--bb.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.54.0](https://img.shields.io/badge/AppVersion-0.54.0-informational?style=flat-square)
+![Version: 0.0.1-bb.3](https://img.shields.io/badge/Version-0.0.1--bb.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.54.0](https://img.shields.io/badge/AppVersion-0.54.0-informational?style=flat-square)
 
 BigBang compatible Helm chart for kubevirt
 
@@ -32,7 +32,7 @@ helm install bigbang-kubevirt chart/
 |-----|------|---------|-------------|
 | kubevirt.enabled | bool | `true` |  |
 | kubevirt.git.repo | string | `"https://repo1.dso.mil/platform-one/big-bang/apps/third-party/kubevirt"` |  |
-| kubevirt.git.branch | string | `"image_pull_secrets"` |  |
+| kubevirt.git.branch | string | `"main"` |  |
 | kubevirt.git.path | string | `"chart"` |  |
 | kubevirt.flux | object | `{}` |  |
 | monitoring.enabled | bool | `false` |  |
@@ -44,6 +44,8 @@ helm install bigbang-kubevirt chart/
 | jaeger.enabled | bool | `false` |  |
 | fluentbit.enabled | bool | `false` |  |
 | twistlock.enabled | bool | `false` |  |
+| loki.enabled | bool | `false` |  |
+| promtail.enabled | bool | `false` |  |
 | flux.timeout | string | `"10m"` |  |
 | flux.interval | string | `"2m"` |  |
 | flux.test.enable | bool | `false` |  |
@@ -56,9 +58,10 @@ helm install bigbang-kubevirt chart/
 
 ## Contributing
 
-Please see the [contributing guide](./CONTRIBUTING.md) if you are interested in contributing. # kubevirt
+Please see the [contributing guide](./CONTRIBUTING.md) if you are interested in contributing.
+# kubevirt
 
-![Version: 0.0.1-bb.2](https://img.shields.io/badge/Version-0.0.1--bb.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.54.0](https://img.shields.io/badge/AppVersion-0.54.0-informational?style=flat-square)
+![Version: 0.0.1-bb.3](https://img.shields.io/badge/Version-0.0.1--bb.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.54.0](https://img.shields.io/badge/AppVersion-0.54.0-informational?style=flat-square)
 
 KubeVirt helm chart package
 
@@ -99,7 +102,9 @@ helm install kubevirt chart/
 | deployment.spec.template.spec.containers.resources.requests.cpu | string | `"10m"` |  |
 | deployment.spec.template.spec.containers.resources.requests.memory | string | `"150Mi"` |  |
 | imagePullSecrets | list | `[]` |  |
+| workloads.nodePlacement | object | `{}` |  |
+| infra.nodePlacement | object | `{}` |  |
 
 ## Contributing
 
-Please see the [contributing guide](./CONTRIBUTING.md) if you are interested in contributing. 
+Please see the [contributing guide](./CONTRIBUTING.md) if you are interested in contributing.

bigbang/Chart.yaml

@@ -3,5 +3,5 @@ apiVersion: v2
 name: bigbang-kubevirt
 description: BigBang compatible Helm chart for kubevirt
 type: application
-version: 0.0.1-bb.2
+version: 0.0.1-bb.3
 appVersion: "0.54.0"

chart/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: kubevirt
 description: KubeVirt helm chart package
 type: application
-version: 0.0.1-bb.2
+version: 0.0.1-bb.3
 appVersion: "0.54.0"

chart/templates/kubevirt.io_v1_kubevirt_kubevirt.yaml

@@ -4,6 +4,13 @@ metadata:
   name: kubevirt
   namespace: {{ .Release.Namespace }}
 spec:
+{{- if .Values.workloads }}
+  workloads:
+{{- if .Values.workloads.nodePlacement }}
+    nodePlacement:
+{{ toYaml .Values.workloads.nodePlacement | indent 6 }}
+{{- end }}
+{{- end }}
   certificateRotateStrategy: {}
   configuration:
     developerConfiguration:
@@ -12,6 +19,10 @@ spec:
   imageRegistry: {{ .Values.deployment.spec.template.spec.containers.image.registry }}
   infra:
     replicas: {{ .Values.deployment.spec.replicas }}
+{{- if .Values.infra.nodePlacement }}
+    nodePlacement:
+{{ toYaml .Values.infra.nodePlacement | indent 6 }}
+{{- end }}
   workloadUpdateStrategy: {}
 {{- if .Values.imagePullSecrets }}
   customizeComponents:

chart/values.yaml

@@ -27,3 +27,22 @@ deployment:
 #     - name: private-registry
 #     - name: repo1-read-creds
 imagePullSecrets: []
+
+# Section for configurable workload container options
+workloads:
+  # https://kubevirt.io/user-guide/operations/installation/#restricting-kubevirt-components-node-placement
+  # 
+  # You may also need to restrict "workloads" pods(virt-handler)
+  # to metal nodes in environments that have a class of metal nodes where
+  # nested virt isn't supported. nodeSelector, tolerations
+  # and affanity configs are supported for placement.
+  nodePlacement: {}
+
+# Section for configurable infra container options
+infra:
+  # https://kubevirt.io/user-guide/operations/installation/#restricting-kubevirt-components-node-placement
+  # 
+  # You may want to restrict "infra" pods(virt-controller, virt-api) to just
+  # controller nodes. nodeSelector, tolerations and affanity configs are
+  # supported for placement.
+  nodePlacement: {}