diff --git a/charts/openstack-hypervisor-operator/templates/deployment.yaml b/charts/openstack-hypervisor-operator/templates/deployment.yaml index b3fbc52c..0452645e 100644 --- a/charts/openstack-hypervisor-operator/templates/deployment.yaml +++ b/charts/openstack-hypervisor-operator/templates/deployment.yaml @@ -47,6 +47,10 @@ spec: value: {{ quote .Values.controllerManager.manager.env.labelSelector }} - name: AGENT_NAMESPACES value: {{ quote .Values.controllerManager.manager.env.agentNamespaces }} + - name: EVICTION_CONCURRENCY + value: {{ quote .Values.controllerManager.manager.env.evictionConcurrency }} + - name: EVICTION_TRAIT_CONCURRENCY + value: {{ quote .Values.controllerManager.manager.env.evictionTraitConcurrency }} - name: KUBERNETES_CLUSTER_DOMAIN value: {{ quote .Values.kubernetesClusterDomain }} - name: GOMEMLIMIT diff --git a/charts/openstack-hypervisor-operator/values.yaml b/charts/openstack-hypervisor-operator/values.yaml index cc4f686c..22f61295 100644 --- a/charts/openstack-hypervisor-operator/values.yaml +++ b/charts/openstack-hypervisor-operator/values.yaml @@ -8,6 +8,8 @@ controllerManager: - --certificate-issuer-name=$(CERTIFICATE_ISSUER_NAME) - --label-selector=$(LABEL_SELECTOR) - --agent-namespaces=$(AGENT_NAMESPACES) + - --eviction-concurrency=$(EVICTION_CONCURRENCY) + - --eviction-trait-concurrency=$(EVICTION_TRAIT_CONCURRENCY) containerSecurityContext: allowPrivilegeEscalation: false capabilities: @@ -18,6 +20,12 @@ controllerManager: certificateNamespace: monsoon3 labelSelector: "" agentNamespaces: "monsoon3" + # Default maximum number of VM migrations to run concurrently while draining a hypervisor. + # Keep this quoted because it is rendered as an environment variable. + evictionConcurrency: "1" + # Optional comma-separated TRAIT=N overrides for per-host migration concurrency. + # The lowest matching trait limit wins, e.g. "CUSTOM_HANA_EXCLUSIVE_HOST=1,CUSTOM_FOO=2". + evictionTraitConcurrency: "" osAuthUrl: "" osProjectDomainName: "" osProjectName: ""