Merge pull request #35 from permitio/raz/per-4775-fix-for-opal-client…

…-in-opal-helm-chart add condition for opal-client null
permitio · Mar 28, 2023 · 6f45f5f · 6f45f5f
2 parents 33aeef5 + 7392619
commit 6f45f5f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/templates/cm.yaml b/templates/cm.yaml
@@ -12,6 +12,7 @@ data:
     {{- .Files.Get "test/e2e/rbac.rego" | nindent 4 }}
 {{- end }}
 ---
+{{- if .Values.client }}
 {{- if .Values.client.opaStartupData }}
 apiVersion: v1
 kind: ConfigMap
@@ -23,3 +24,4 @@ data:
     {{ $value |  nindent 4 }}
   {{- end }}
 {{- end }}
+{{- end }}
diff --git a/templates/deployment-pgsql.yaml b/templates/deployment-pgsql.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{- include "opal.pgsqlLabels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.client.replicas }}
+  replicas: {{ .Values.broadcastReplicas }}
   selector:
     matchLabels:
       {{- include "opal.pgsqlSelectorLabels" . | nindent 6 }}

diff --git a/templates/tests/e2e.yaml b/templates/tests/e2e.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.client }}
 {{- $url := printf "http://%v:%v/v1/data" (include "opal.clientName" .) .Values.client.opaPort -}}
 apiVersion: v1
 kind: Pod
@@ -22,3 +23,4 @@ spec:
 
       [ "$(curl -s {{ $url }} | jq '.result.users | keys | length')" -eq 3 ]
       [ "$(curl -s {{ $url }} | jq '.result.role_permissions | keys | length')" -eq 3 ]
+{{- end }}
diff --git a/values.schema.json b/values.schema.json
@@ -62,6 +62,9 @@
         "broadcastPgsql": {
           "type": "boolean", "title": "install broadcast pgsql", "default": true
         },
+        "broadcastReplicas": {
+          "type": "integer", "title": "replicas for broadcast pgsql", "default": 1
+        },
         "uvicornWorkers": {
           "type": "integer", "title": "num of uvicorn workers per pod", "default": 4
         },