fix tests

Author: Avi Moondra

charts/retool/ci/kubeconform-values.yaml

@@ -302,3 +302,6 @@ extraManifests: []
 securityGroupPolicy:
   enabled: false
   groupIds: []
+
+internalWorker:
+  enabled: true

charts/retool/templates/_helpers.tpl

@@ -200,18 +200,3 @@ Set code executor service name
 {{- define "retool.codeExecutor.name" -}}
 {{ template "retool.fullname" . }}-code-executor
 {{- end -}}
-
-
-{{/*
-Set Worker enabled
-Usage:  (include "retool.worker.enabled" .)
-*/}}
-{{- define "retool.worker.enabled" -}}
-{{- $output := "" -}}
-{{- if or (include "retool.workflows.enabled" .) (.Values.internalWorker.enabled) -}}
-  {{- $output = "1" -}}
-{{- else -}}
-  {{- $output = "" -}}
-{{- end -}}
-{{- $output -}}
-{{- end -}}

charts/retool/templates/_validations.tpl

@@ -1,17 +1,17 @@
 {{/* Compile all validation warnings into a single message and call fail. */}}
 {{- define "retool.validationRules" -}}
 {{- $messages := list -}}
-{{- $messages = append $messages (include "retool.validationRules.workers" .) -}}
+{{- $messages = append $messages (include "retool.validationRules.internalWorker" .) -}}
 {{- $messages = without $messages "" -}}
 {{- $message := join "\n" $messages -}}
 {{- if $message -}}
 {{- printf "\nVALUES VALIDATION:\n%s" $message | fail -}}
 {{- end -}}
 {{- end -}}
 
-{{- define "retool.validationRules.workers" -}}
-{{- if not (or (not (include "retool.worker.enabled" .)) (and (include "retool.worker.enabled" .) (include "retool.temporal.enabled" .))) -}}
-workers:
-  Workers are enabled (via internalWorker.enabled, workflows.enabled explicitly, or workflows.enabled implicitly based on image.tag > 3.6.11), but Temporal is not enabled via retool-temporal-services-helm.enabled or workflows.temporal.enabled
+{{- define "retool.validationRules.internalWorker" -}}
+{{- if not (or (not (.Values.internalWorker.enabled)) (and (.Values.internalWorker.enabled) (or (include "retool.temporal.enabled" .) (include "retool.workflows.enabled" .)))) -}}
+internalWorker:
+  Internal worker is enabled (via internalWorker.enabled), but Temporal is not enabled via retool-temporal-services-helm.enabled or workflows.temporal.enabled or via Retool's Managed Temporal for Retool Workflows (via workflows.enabled explicitly, or workflows.enabled implicitly based on image.tag > 3.6.11)
 {{- end -}}
 {{- end -}}