diff --git a/CHANGELOG.md b/CHANGELOG.md index f82affa5df6e0dfbf376b92a635673b5da050e72..588da4fa12caeadcb65b0b282116ee53459f4a81 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/README.md b/README.md index a48bab971138b5dab96ccfd0f7746736c59706cd..be89cc383edea92e5c77d91a583328d17eeba5a0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # bigbang-kubevirt -   +   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 -   +   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. diff --git a/bigbang/Chart.yaml b/bigbang/Chart.yaml index f741f59f166d0a03c2f3131746ae9a1213511494..93d774839b290a344adc500009c7c38be5e52f56 100644 --- a/bigbang/Chart.yaml +++ b/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" diff --git a/chart/Chart.yaml b/chart/Chart.yaml index b18cc5d9a06928d42f80431f5e849b56a0f19708..2e326e375c1b5a14c39bfc7f244d391721304732 100644 --- a/chart/Chart.yaml +++ b/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" diff --git a/chart/templates/kubevirt.io_v1_kubevirt_kubevirt.yaml b/chart/templates/kubevirt.io_v1_kubevirt_kubevirt.yaml index 250e5eac5c66288f5ad11175e52aa382e2453959..80f763668d0c7776900e72040f5e061d55afafac 100644 --- a/chart/templates/kubevirt.io_v1_kubevirt_kubevirt.yaml +++ b/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: diff --git a/chart/values.yaml b/chart/values.yaml index afdb75cf95adfc67d8db8e2608cb15ec8209e1f3..54279e5cf9d34ba0a28f41b019cb24ba6c996e33 100644 --- a/chart/values.yaml +++ b/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: {}