fix tests

charts/retool/ci/kubeconform-values.yaml

@@ -303,58 +303,5 @@ securityGroupPolicy:
   enabled: false
   groupIds: []
 
-retool-temporal-services-helm:
-  # Disable this if using your own Temporal Cluster
-  enabled: true
-  server:
-    # Defines image to be used for temporal server
-    image:
-      repository: tryretool/one-offs
-      tag: retool-temporal-1.1.3
-      pullPolicy: IfNotPresent
-    # this configures grpc_health_probe (https://github.com/grpc-ecosystem/grpc-health-probe)
-    # for healthchecks instead of native k8s.
-    # Set this to true if deploying in a k8s cluster on version <1.24
-    useLegacyHealthProbe: false
-    config:
-      # the below values specify the database for temporal internals and workflow state
-      # both can point to the same db, and even the same as retool main above, although throughput
-      # will be limited. We strongly suggest using two total DBs: one for retool-main and one
-      # for default and visibility below
-      persistence:
-        default:
-          sql:
-            host: "fake.com"
-            database: "temporal"
-            user: "retool"
-            password: "fake"
-            port: 5432
-        visibility:
-          sql:
-            host: "fake.com"
-            database: "temporal_visibility"
-            user: "retool"
-            password: "fake"
-            port: 5432
-      # use-cases with very high throughput demands (>10k workflow blocks/sec) can modify
-      # below value to be higher, such as 512 or 1024
-      numHistoryShards: 128
-
-    # define resources for each temporal service -- these are sane starting points that allow
-    # for scaling to ~3 workflow workers without hitting bottlenecks
-    resources:
-      limits:
-        cpu: 500m
-        memory: 1024Mi
-      requests:
-        cpu: 100m
-        memory: 128Mi
-    # example of setting service-specific resources, here we increase memory limit for history server
-    history:
-      resources:
-        limits:
-          cpu: 500m
-          memory: 2Gi
-        requests:
-          cpu: 100m
-          memory: 128Mi
+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 -}}