Merge pull request #532 from carbonin/add_worker_resource_flag

Add a flag to gate worker resource constraints
ManageIQ · Jul 6, 2020 · 2b8519e · 2b8519e
2 parents 25504b5 + b9941df
commit 2b8519e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 0 deletions.
diff --git a/images/manageiq-orchestrator/container-assets/entrypoint b/images/manageiq-orchestrator/container-assets/entrypoint
@@ -50,6 +50,19 @@ function create_initial_group() {
   fi
 }
 
+function set_resource_setting() {
+  echo "== Updating resource constraint settings =="
+  script=$(cat <<- EOS
+    settings = {
+      'server/worker_monitor/enforce_resource_constraints' => ENV['WORKER_RESOURCES'] == 'true'
+    }
+    MiqRegion.my_region.add_settings_for_resource(settings)
+EOS
+)
+
+  bin/rails runner "$script"
+}
+
 check_svc_status ${MEMCACHED_SERVICE_HOST} ${MEMCACHED_SERVICE_PORT}
 check_svc_status ${DATABASE_HOSTNAME} ${DATABASE_PORT}
 
@@ -98,5 +111,6 @@ esac
 
 pushd ${APP_ROOT}
   update_auth_settings
+  set_resource_setting
 popd
 exec ruby /var/www/miq/vmdb/lib/workers/bin/evm_server.rb
diff --git a/manageiq-operator/deploy/crds/manageiq.org_manageiqs_crd.yaml b/manageiq-operator/deploy/crds/manageiq.org_manageiqs_crd.yaml
@@ -63,6 +63,10 @@ spec:
             enableSSO:
               description: 'Flag to enable SSO in the application (default: false)'
               type: boolean
+            enforceWorkerResourceConstraints:
+              description: 'Flag to trigger worker resource constraint enforcement
+                (default: false)'
+              type: boolean
             httpdAuthConfig:
               description: Secret containing the httpd configuration files Mutually
                 exclusive with the OIDCClientSecret and OIDCProviderURL if using openid-connect

diff --git a/manageiq-operator/deploy/olm-catalog/manageiq-operator/0.0.1/manageiq.org_manageiqs_crd.yaml b/manageiq-operator/deploy/olm-catalog/manageiq-operator/0.0.1/manageiq.org_manageiqs_crd.yaml
@@ -63,6 +63,10 @@ spec:
             enableSSO:
               description: 'Flag to enable SSO in the application (default: false)'
               type: boolean
+            enforceWorkerResourceConstraints:
+              description: 'Flag to trigger worker resource constraint enforcement
+                (default: false)'
+              type: boolean
             httpdAuthConfig:
               description: Secret containing the httpd configuration files Mutually
                 exclusive with the OIDCClientSecret and OIDCProviderURL if using openid-connect

diff --git a/manageiq-operator/pkg/apis/manageiq/v1alpha1/manageiq_types.go b/manageiq-operator/pkg/apis/manageiq/v1alpha1/manageiq_types.go
@@ -28,6 +28,10 @@ type ManageIQSpec struct {
 	// +optional
 	InitialAdminGroupName string `json:"initialAdminGroupName"`
 
+	// Flag to trigger worker resource constraint enforcement (default: false)
+	// +optional
+	EnforceWorkerResourceConstraints *bool `json:"enforceWorkerResourceConstraints"`
+
 	// Database volume size (default: 15Gi)
 	// +optional
 	DatabaseVolumeCapacity string `json:"databaseVolumeCapacity"`
@@ -294,6 +298,10 @@ func (m *ManageIQ) Initialize() {
 		spec.DatabaseRegion = "0"
 	}
 
+	if spec.EnforceWorkerResourceConstraints == nil {
+		spec.EnforceWorkerResourceConstraints = new(bool)
+	}
+
 	if spec.DatabaseVolumeCapacity == "" {
 		spec.DatabaseVolumeCapacity = "15Gi"
 	}

diff --git a/manageiq-operator/pkg/apis/manageiq/v1alpha1/zz_generated.deepcopy.go b/manageiq-operator/pkg/apis/manageiq/v1alpha1/zz_generated.deepcopy.go
diff --git a/manageiq-operator/pkg/helpers/miq-components/orchestrator.go b/manageiq-operator/pkg/helpers/miq-components/orchestrator.go
@@ -268,6 +268,10 @@ func OrchestratorDeployment(cr *miqv1alpha1.ManageIQ, scheme *runtime.Scheme) (*
 				Name:  "ADMIN_GROUP",
 				Value: cr.Spec.InitialAdminGroupName,
 			},
+			corev1.EnvVar{
+				Name:  "WORKER_RESOURCES",
+				Value: strconv.FormatBool(*cr.Spec.EnforceWorkerResourceConstraints),
+			},
 		},
 	}