Add extra configuration for problem-operator (#105)

* Add configuration for HIGH_CPU_USAGE_BROKER_SERVICE_NAME and HIGH_CPU_USAGE_FLAG_NAME

* Adjust helm chart to detup HIGH_CPU_USAGE_BROKER_SERVICE_NAME

Author: dczupryn-dt

helm/easytrade/values.yaml

@@ -332,6 +332,7 @@ problem-operator:
   env:
     POD_NAMESPACE: "{{ .Release.Namespace }}"
     HIGH_CPU_USAGE_BROKER_SERVICE_CPU_LIMIT: "300m"
+    HIGH_CPU_USAGE_BROKER_SERVICE_NAME: "{{ .Release.Name }}-broker-service"
     FEATURE_FLAG_SERVICE_PROTOCOL: http
     FEATURE_FLAG_SERVICE_BASE_URL: "{{ .Release.Name }}-feature-flag-service"
     FEATURE_FLAG_SERVICE_PORT: "8080"

src/problem-operator/README.md

@@ -72,6 +72,8 @@ When the `high_cpu_usage` feature flag is turned on, a CPU limits is applied to
 
 This controller behavior can be altered using environment variables:
 
-| Name                                    | Description                                                          | Default |
-| --------------------------------------- | -------------------------------------------------------------------- | ------- |
-| HIGH_CPU_USAGE_BROKER_SERVICE_CPU_LIMIT | CPU resource value that should be applied during the problem pattern | 300m    |
+| Name                                    | Description                                                          | Default        |
+| --------------------------------------- | -------------------------------------------------------------------- | -------------- |
+| HIGH_CPU_USAGE_BROKER_SERVICE_NAME      | Name of the broker service deployment to target                      | broker-service |
+| HIGH_CPU_USAGE_FLAG_NAME                | Name of the feature flag that triggers this controller               | high_cpu_usage |
+| HIGH_CPU_USAGE_BROKER_SERVICE_CPU_LIMIT | CPU resource value that should be applied during the problem pattern | 300m           |

src/problem-operator/controllers/highcpuusage/brokerservice.go

@@ -16,19 +16,45 @@ import (
 )
 
 const (
-	brokerService = "broker-service"
-	highCpuUsage  = "high_cpu_usage"
+	brokerServiceDefault = "broker-service"
+	brokerServiceEnv     = "HIGH_CPU_USAGE_BROKER_SERVICE_NAME"
+
+	highCpuUsageDefault = "high_cpu_usage"
+	highCpuUsageEnv     = "HIGH_CPU_USAGE_FLAG_NAME"
 
 	cpuLimitValueDefault = "300m"
 	cpuLimitValueEnv     = "HIGH_CPU_USAGE_BROKER_SERVICE_CPU_LIMIT"
 )
 
 type BrokerController struct {
-	logger *zap.SugaredLogger
+	logger        *zap.SugaredLogger
+	brokerService string
+	highCpuUsage  string
+	cpuLimitValue string
 }
 
 func NewBrokerController(l *zap.SugaredLogger) *BrokerController {
-	return &BrokerController{logger: l}
+	brokerService := os.Getenv(brokerServiceEnv)
+	if brokerService == "" {
+		brokerService = brokerServiceDefault
+	}
+
+	highCpuUsage := os.Getenv(highCpuUsageEnv)
+	if highCpuUsage == "" {
+		highCpuUsage = highCpuUsageDefault
+	}
+
+	cpuLimitValue := os.Getenv(cpuLimitValueEnv)
+	if cpuLimitValue == "" {
+		cpuLimitValue = cpuLimitValueDefault
+	}
+
+	return &BrokerController{
+		logger:        l,
+		brokerService: brokerService,
+		highCpuUsage:  highCpuUsage,
+		cpuLimitValue: cpuLimitValue,
+	}
 }
 
 func (c *BrokerController) ApplyChange(
@@ -42,12 +68,7 @@ func (c *BrokerController) ApplyChange(
 		return fmt.Errorf("unable to cast %s object to appsv1.Deployment: %w", obj.GetName(), controllers.ErrObjectCast)
 	}
 
-	cpuLimitStr, found := os.LookupEnv(cpuLimitValueEnv)
-	if !found {
-		cpuLimitStr = cpuLimitValueDefault
-	}
-
-	cpuLimit, err := resource.ParseQuantity(cpuLimitStr)
+	cpuLimit, err := resource.ParseQuantity(c.cpuLimitValue)
 	if err != nil {
 		return fmt.Errorf("can't use %s as resource quantity: %w", cpuLimit.String(), err)
 	}
@@ -112,7 +133,7 @@ func (c *BrokerController) GetResource(
 	namespace string,
 	client kubernetes.Interface,
 ) (operator.Object, error) {
-	deployment, err := client.AppsV1().Deployments(namespace).Get(ctx, brokerService, metav1.GetOptions{})
+	deployment, err := client.AppsV1().Deployments(namespace).Get(ctx, c.brokerService, metav1.GetOptions{})
 	if err != nil {
 		return nil, fmt.Errorf("failed to get the deployment: %w", err)
 	}
@@ -123,5 +144,5 @@ func (c *BrokerController) GetResource(
 }
 
 func (c *BrokerController) GetFlagName() string {
-	return highCpuUsage
+	return c.highCpuUsage
 }