Skip to content

Commit

Permalink
Set remote_directory.no_tls when no certs are configured
Browse files Browse the repository at this point in the history
  • Loading branch information
ronenh committed Nov 27, 2024
1 parent 2b37288 commit 693ee81
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
4 changes: 2 additions & 2 deletions charts/topaz/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.2.0
version: 0.2.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.32.37"
appVersion: "0.32.38"

dependencies:
- name: aserto-lib
Expand Down
15 changes: 10 additions & 5 deletions charts/topaz/templates/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,27 @@ stringData:
log_level: {{ .Values.logLevel | default "info" }}
grpc_log_level: {{ .Values.grpcLogLevel | default "info" }}
{{- if empty ((.Values.directory).remote).address }}
{{- if empty ((.Values.directory).remote).address }}
directory:
db_path: /db/directory.db
request_timeout: {{ ((.Values.directory).edge).openTimeout | default "5s" }}

remote_directory:
address: 0.0.0.0:{{ (.Values.ports).grpc | default "8282" }}
{{- if (.Values.auth).apiKeys }}
{{- if (.Values.auth).apiKeys }}
api_key: {{ include "topaz.apiKeys" . | fromYamlArray | first }}
{{- end }}
{{- end }}
insecure: false
{{- if (.Values.tls).grpc }}
ca_cert_path: /grpc-certs/grpc-ca.crt
{{- else }}
no_tls: true
{{- end }}
timeout_in_seconds: {{ ((.Values.directory).remote).timeoutSeconds | default "5" }}
{{- else -}}
{{- else -}}
remote_directory:
{{- include "topaz.remoteDirectory" . | nindent 6 }}
{{- end }}
{{- end }}

jwt:
acceptable_time_skew_seconds: {{ .Values.jwtAcceptableSkewSeconds | default "5"}}
Expand Down

0 comments on commit 693ee81

Please sign in to comment.