do not deploy virtualization if moduleconfig is not valid

Signed-off-by: Yaroslav Borbat <[email protected]>

Author: yaroslavborbat

hooks/module_config_validator.py

@@ -30,7 +30,7 @@ class ModuleConfigValidateHook(Hook):
     def __init__(self, module_name: str):
         self.module_name = module_name
         self.queue = f"/modules/{self.module_name}/{self.SNAPSHOT_MODULE_CONFIG}"
-        self.path = "virtualization.internal.ready"
+        self.path = "virtualization.internal.isReady"
 
     def generate_config(self) -> dict:
         """executeHookOnEvent is empty because we need only execute at module start."""

openapi/values.yaml

@@ -122,6 +122,6 @@ properties:
         properties:
           nodeCount:
             type: integer
-      ready:
+      isReady:
         type: boolean
         default: false

templates/admission-policy.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- $kubeVersion := .Values.global.discovery.kubernetesVersion }}
 {{- $apiVersion := "" }}
 {{- if semverCompare ">=1.30.0" $kubeVersion }}

templates/cdi/cdi-apiserver/vpa.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if (.Values.global.enabledModules | has "vertical-pod-autoscaler-crd") }}
 ---
 apiVersion: autoscaling.k8s.io/v1

templates/cdi/cdi-deployment/rbac-for-us.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

templates/cdi/cdi-deployment/vpa.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if (.Values.global.enabledModules | has "vertical-pod-autoscaler-crd") }}
 ---
 apiVersion: autoscaling.k8s.io/v1

templates/cdi/cdi-operator/configmap.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 ---
 apiVersion: v1
 kind: ConfigMap

templates/cdi/cdi-operator/deployment.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.virtualization.internal.ready }}
 {{- $priorityClassName := include "priorityClassName" . }}
 
 {{- define "cdi_images" -}}
@@ -19,6 +18,7 @@ cpu: 10m
 memory: 150Mi
 {{- end }}
 
+{{- if .Values.virtualization.internal.isReady }}
 {{- if (.Values.global.enabledModules | has "vertical-pod-autoscaler-crd") }}
 ---
 apiVersion: autoscaling.k8s.io/v1

templates/cdi/cdi-operator/rbac-for-us.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

templates/cdi/config.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- $nodeSelectorSystem := index (include "helm_lib_node_selector" (tuple . "system") | fromYaml) "nodeSelector" | default (dict) | toJson }}
 {{- $nodeSelectorMaster := index (include "helm_lib_node_selector" (tuple . "master") | fromYaml) "nodeSelector" | default (dict) | toJson }}
 {{- $tolerationsSystem := index (include "helm_lib_tolerations" (tuple . "system") | fromYaml) "tolerations" | default (list) | toJson }}

templates/cdi/service-monitor.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if (.Values.global.enabledModules | has "operator-prometheus-crd") }}
 ---
 apiVersion: monitoring.coreos.com/v1

templates/certificate.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if eq (include "helm_lib_module_https_mode" .) "CertManager" }}
 ---
 apiVersion: cert-manager.io/v1
@@ -16,4 +16,5 @@ spec:
   issuerRef:
     name: {{ include "helm_lib_module_https_cert_manager_cluster_issuer_name" . }}
     kind: ClusterIssuer
-{{- end }}{{- end }}
+{{- end }}
+{{- end }}

templates/custom-certificate.yaml

@@ -1,3 +1,3 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- include "helm_lib_module_https_copy_custom_certificate" (list . "d8-virtualization" "ingress-tls") -}}
 {{- end }}

templates/dvcr/ nodegroupconfiguration.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if ne (dig "dvcr" "serviceIP" "" .Values.virtualization.internal) "" }}
 ---
     {{- $ca := printf "%s" .Values.virtualization.internal.dvcr.cert.ca }}

templates/dvcr/configmap.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -27,4 +27,5 @@ data:
       storagedriver:
         enabled: true
         interval: 10s
-        threshold: 3{{- end }}
+        threshold: 3
+{{- end }}

templates/dvcr/deployment.yaml

@@ -1,9 +1,9 @@
-{{- if .Values.virtualization.internal.ready }}
 {{- $priorityClassName := include "priorityClassName" . }}
 {{- define "dvcr_resources" }}
 cpu: 50m
 memory: 150Mi
 {{- end }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if (.Values.global.enabledModules | has "vertical-pod-autoscaler-crd") }}
 ---
 apiVersion: autoscaling.k8s.io/v1

templates/dvcr/pvc.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if eq .Values.virtualization.dvcr.storage.type "PersistentVolumeClaim" }}
 {{- $storageClassName := dig "storageClassName" "" .Values.virtualization.dvcr.storage.persistentVolumeClaim }}
 kind: PersistentVolumeClaim

templates/dvcr/rbac-for-us.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -21,4 +21,5 @@ subjects:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: d8:rbac-proxy{{- end }}
+  name: d8:rbac-proxy
+{{- end }}

templates/dvcr/secret.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if ne (dig "dvcr" "serviceIP" "" .Values.virtualization.internal) "" }}
 ---
 apiVersion: v1

templates/dvcr/service-monitor.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if (.Values.global.enabledModules | has "operator-prometheus-crd") }}
 ---
 apiVersion: monitoring.coreos.com/v1

templates/dvcr/svc.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -18,4 +18,4 @@ spec:
       targetPort: https-metrics
   selector:
     app: dvcr
-  {{- end }}
+{{- end }}

templates/kube-api-rewriter/cm-kubeconfig-local.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 ---
 apiVersion: v1
 kind: ConfigMap

templates/kubevirt/kubevirt.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.virtualization.internal.ready }}
 {{- $nodeSelectorSystem := index (include "helm_lib_node_selector" (tuple . "system") | fromYaml) "nodeSelector" | default (dict) | toJson }}
 {{- $nodeSelectorMaster := index (include "helm_lib_node_selector" (tuple . "master") | fromYaml) "nodeSelector" | default (dict) | toJson }}
 {{- $tolerationsSystem := index (include "helm_lib_tolerations" (tuple . "system") | fromYaml) "tolerations" | default (list) | toJson }}
@@ -279,4 +278,3 @@ env:
   workloadUpdateStrategy:
     workloadUpdateMethods:
       - LiveMigrate
-{{- end }}

templates/kubevirt/service-monitor.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if (.Values.global.enabledModules | has "operator-prometheus-crd") }}
 ---
 apiVersion: monitoring.coreos.com/v1

templates/kubevirt/virt-api/vpa.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if (.Values.global.enabledModules | has "vertical-pod-autoscaler-crd") }}
 ---
 apiVersion: autoscaling.k8s.io/v1

templates/kubevirt/virt-controller/rbac-for-us.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

templates/kubevirt/virt-controller/vpa.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if (.Values.global.enabledModules | has "vertical-pod-autoscaler-crd") }}
 ---
 apiVersion: autoscaling.k8s.io/v1

templates/kubevirt/virt-handler/rbac-for-us.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

templates/kubevirt/virt-handler/vpa.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if (.Values.global.enabledModules | has "vertical-pod-autoscaler-crd") }}
 ---
 apiVersion: autoscaling.k8s.io/v1

templates/kubevirt/virt-operator/deployment.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.virtualization.internal.ready }}
 {{- $priorityClassName := include "priorityClassName" . }}
 {{- define "kubevirt_images" -}}
 - name: VIRT_OPERATOR_IMAGE
@@ -16,6 +15,7 @@
 cpu: 10m
 memory: 150Mi
 {{- end }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- if (.Values.global.enabledModules | has "vertical-pod-autoscaler-crd") }}
 ---
 apiVersion: autoscaling.k8s.io/v1

templates/kubevirt/virt-operator/rbac-for-us.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 ---
 apiVersion: v1
 kind: ServiceAccount

templates/monitoring.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 {{- include "helm_lib_grafana_dashboard_definitions" . }}
 {{- include "helm_lib_prometheus_rules" (list . "d8-virtualization") }}
 {{- end }}

templates/namespace.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 ---
 apiVersion: v1
 kind: Namespace

templates/nodegroupconfiguration-aio-max-nr.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: deckhouse.io/v1alpha1
 kind: NodeGroupConfiguration
 metadata:

templates/nodegroupconfiguration-redos.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: deckhouse.io/v1alpha1
 kind: NodeGroupConfiguration
 metadata:

templates/pre-delete-hook/job.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: batch/v1
 kind: Job
 metadata:

templates/pre-delete-hook/rbac-for-us.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 ---
 apiVersion: v1
 kind: ServiceAccount

templates/rbac-to-us.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

templates/rbacv2/manage/permissions/manage_internals.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/manage/permissions/manage_resources.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/manage/permissions/view_resources.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/manage/roles/manager.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/manage/roles/superadmin.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/manage/roles/viewer.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/capabilities/access_console.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/capabilities/access_remote_display.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/capabilities/execute_virtualmachine_operations.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/capabilities/forward_ports.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/capabilities/manage_internals.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/capabilities/manage_limits.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/capabilities/manage_quotas.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/capabilities/manage_resources.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/capabilities/view_resources.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/capabilities/view_secrets.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/roles/admin.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/roles/manager.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

templates/rbacv2/use/roles/superadmin.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.virtualization.internal.ready }}
+{{- if .Values.virtualization.internal.isReady }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata: