Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(helm chart): template to produce identical environment variables for both server & objects pods #2304

Merged
merged 3 commits into from
May 30, 2024
Merged

refactor(helm chart): template to produce identical environment variables for both server & objects pods #2304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11fb2cd
fix(helm chart): objects pod should also have automate feature flag e…
iainsproat May 30, 2024
0e54675
refactor(helm chart): share environment variables between server & ob…
iainsproat May 30, 2024
373928d
Merge branch 'main' into iain/share-env-vars-server-objects
iainsproat May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(helm chart): objects pod should also have automate feature flag e… 
…nv vars
  • Loading branch information
@iainsproat
iainsproat committed May 30, 2024
commit 11fb2cd052c5696329884737623966a8d756b8bf
15 changes: 12 additions & 3 deletions utils/helm/speckle-server/templates/objects/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@ spec:
- name: MAX_OBJECT_SIZE_MB
value: {{ .Values.objects.max_object_size_mb | quote }}

- name: SPECKLE_AUTOMATE_URL
value: {{ .Values.server.speckleAutomateUrl }}

# *** Redis ***
- name: REDIS_URL
valueFrom:
Expand Down Expand Up @@ -324,6 +321,18 @@ spec:
key: {{ default "apollo_key" .Values.server.monitoring.apollo.key.secretKey }}
{{- end }}

# Automate
- name: FF_AUTOMATE_MODULE_ENABLED
value: {{ .Values.featureFlags.automateModuleEnabled | quote }}

{{- if .Values.featureFlags.automateModuleEnabled }}
- name: SPECKLE_AUTOMATE_URL
value: {{ .Values.server.speckleAutomateUrl }}

- name: AUTOMATE_ENCRYPTION_KEYS_PATH
value: {{ .Values.server.encryptionKeys.path }}
{{- end }}

# Rate Limiting
{{- if .Values.server.ratelimiting.all_requests }}
- name: RATELIMIT_ALL_REQUESTS
Expand Down
13 changes: 6 additions & 7 deletions utils/helm/speckle-server/templates/server/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,14 @@ spec:

- name: FF_AUTOMATE_MODULE_ENABLED
value: {{ .Values.featureFlags.automateModuleEnabled | quote }}

{{- if .Values.featureFlags.automateModuleEnabled }}

{{- if .Values.featureFlags.automateModuleEnabled }}
- name: SPECKLE_AUTOMATE_URL
value: {{ .Values.server.speckleAutomateUrl }}

- name: AUTOMATE_ENCRYPTION_KEYS_PATH
value: {{ .Values.server.encryptionKeys.path }}
{{- end }}
{{- end }}

- name: ONBOARDING_STREAM_URL
value: {{ .Values.server.onboarding.stream_url }}
Expand All @@ -144,10 +147,6 @@ spec:
- name: MAX_OBJECT_SIZE_MB
value: {{ .Values.server.max_object_size_mb | quote }}

- name: SPECKLE_AUTOMATE_URL
value: {{ .Values.server.speckleAutomateUrl }}


{{- if .Values.server.migration.movedFrom }}
- name: MIGRATION_SERVER_MOVED_FROM
value: {{ .Values.server.migration.movedFrom }}
Expand Down