Merge pull request #27 from ethyca/rk-worker-fix

Fix How Enabling Workers Functions

fides/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: fides
-version: 0.8.0
-appVersion: "2.6.3"
+version: 0.8.1
+appVersion: "2.6.4"
 description: Fides is an open-source privacy engineering platform for managing the fulfillment of data privacy requests in your runtime environment, and the enforcement of privacy regulations in your code.
 type: application
 keywords:

fides/templates/_helpers.tpl

@@ -146,13 +146,6 @@ Create the name of the config map to store the fides.toml file.
 {{ printf "worker-%s" (include "fides.tomlConfigMapName" .) | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
-{{/*
-Boolean to determine whether workers are enabled.
-*/}}
-{{- define "fides.worker.enabled" -}}
-{{ ge (.Values.fides.workers.count | int) 1 }}
-{{- end }}
-
 {{/*
 List of CORS origins, concatenated, deduplicated, and formatted.
 */}}

fides/templates/fides/fides-config.yaml

@@ -14,7 +14,7 @@ data:
     [celery]
     event_queue_prefix = "fides_worker"
     task_default_queue = "fides"
-    task_always_eager = {{ not ( include "fides.worker.enabled" . ) }}
+    task_always_eager = {{ not $.worker }}
 
     [security]
     cors_origins = {{ include "fides.corsOrigins" . | trim }}

fides/templates/fides/worker-config.yaml

@@ -1,4 +1,4 @@
-{{- if (include "fides.worker.enabled" .) }}
+{{- if $.worker }}
 apiVersion: v1
 kind: ConfigMap
 metadata:

fides/templates/fides/worker-deployment.yaml

@@ -1,4 +1,5 @@
-{{- if (include "fides.worker.enabled" .) }}
+{{- $_ := set $ "worker" ( ge (.Values.fides.workers.count | int) 1) }}
+{{- if $.worker }}
 {{- $volume := "config" }}
 {{- $configPath := "/etc/fides/config" }}
 apiVersion: apps/v1
@@ -12,7 +13,7 @@ spec:
   selector:
     matchLabels:
       {{- include "fides.worker.selectorLabels" . | nindent 6 }}
-  strategy: 
+  strategy:
     {{- include "fides.deploymentStrategy" . | nindent 4 }}
   template:
     metadata:

fides/values.yaml

@@ -19,7 +19,7 @@ fides:
     # fides.configure.additionalEnvVar adds arbitrary environment variables to the configuration, in addition to those set
     # by the Helm chart. See https://ethyca.github.io/fides/installation/configuration/ for all possible values.
     additionalEnvVars:
-      - name: FIDES__LOGGING__LOG_PII 
+      - name: FIDES__LOGGING__LOG_PII
         value: "false"
       - name: FIDES__LOGGING__LEVEL # Accepted values include: DEBUG, INFO, WARNING, ERROR, and CRITICAL.
         value: "INFO"
@@ -34,7 +34,7 @@ fides:
       - name: FIDES__REDIS__SSL_CERT_REQS # Accepted values include: none, optional and require.
         value: "none"
       # Additional environment variables may be declared here.
-    # fides.configuration.fidesSecuritySecretName is an optional parameter that respresents the name of a Kubernetes secret containing sensitive Fides configuration elements. This secret must have the following keys: 
+    # fides.configuration.fidesSecuritySecretName is an optional parameter that respresents the name of a Kubernetes secret containing sensitive Fides configuration elements. This secret must have the following keys:
     # FIDES__SECURITY__APP_ENCRYPTION_KEY, FIDES__SECURITY__OAUTH_ROOT_CLIENT_ID, FIDES__SECURITY__OAUTH_ROOT_CLIENT_SECRET, FIDES__SECURITY__DRP_JWT_SECRET
     fidesSecuritySecretName: ""
     # fides.configuration.additionalCORSOrigins is an optional parameter to configure allowed CORS origins in addition to the Fides and Privacy Center URLs.
@@ -55,15 +55,15 @@ fides:
 
 # privacyCenter is the end-user facing application where data subjects can submit privacy requests.
 privacyCenter:
-  # privacyCenter.enabled determines whether a privacy center will be deployed. 
+  # privacyCenter.enabled determines whether a privacy center will be deployed.
   enabled: true
   image:
     repository: ethyca/fides-privacy-center
     pullPolicy: IfNotPresent
     # Overrides the Fides Privacy Center image tag whose default is the chart appVersion.
     tag: ""
   configuration:
-    # privacyCenter.configuration.configJsonPath specifies the location of the config.json as described in https://ethyca.github.io/fides/ui/privacy_center/. 
+    # privacyCenter.configuration.configJsonPath specifies the location of the config.json as described in https://ethyca.github.io/fides/ui/privacy_center/.
     # Note: the value of server_url_production will be overwritten to use the hostname specified by ingress.hosts.fides
     configJsonPath: config/privacyCenterConfig.json
     # privacyCenter.configuration.configCSSPath specifies the location of the config.css file to override the default styles.
@@ -88,7 +88,7 @@ nameOverride: ""
 imagePullSecrets: []
 
 # useRollingUpdate helps to minimize upgrade downtime by running deployment upgrades with a RollingUpdate strategy.
-# When useRollingUpdate is set to false, the Recreate strategy is used instead. For production deployments, 
+# When useRollingUpdate is set to false, the Recreate strategy is used instead. For production deployments,
 # useRollingUpdate should be set to true.
 useRollingUpdate: true
 
@@ -103,10 +103,12 @@ serviceAccount:
 
 podAnnotations: {}
 
-podSecurityContext: {}
+podSecurityContext:
+  {}
   # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  {}
   # capabilities:
   #   drop:
   #   - ALL
@@ -117,15 +119,17 @@ securityContext: {}
 ingress:
   enabled: false
   className: ""
-  annotations: {}
+  annotations:
+    {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   tls: []
   #  - secretName: fides-tls
   #    hosts:
   #      - privacy.example.com
 
-resources: {}
+resources:
+  {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following