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

add userlog_global_notifications_secret #400

Merged
merged 8 commits into from
Oct 17, 2023
Merged

add userlog_global_notifications_secret #400

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9805548
add userlog_global_notifications_secret
case0sh Sep 20, 2023
2cd2b55
add secrets for userlog
case0sh Sep 27, 2023
3ba4c61
add secrets for userlog
case0sh Sep 27, 2023
bf8d5ea
add secret options
case0sh Oct 10, 2023
3d7029a
fix notifications secrets
case0sh Oct 13, 2023
3364b29
fix notifications secrets
case0sh Oct 13, 2023
a9c343b
fix notifications secrets
case0sh Oct 13, 2023
2f3e634
add docs
case0sh Oct 17, 2023
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
6 changes: 6 additions & 0 deletions charts/ocis/docs/values-desc-table.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3144,6 +3144,12 @@ a| [subs=-attributes]
a| [subs=-attributes]
`{}`
| Per-service nodeSelector configuration. Overrides the default setting from `nodeSelector` if set.
| services.userlog.notificationsSecret
a| [subs=-attributes]
+string+
a| [subs=-attributes]
`""`
| The secret to secure the global notifications endpoint. Only system admins and users knowing that secret can call the global notifications POST/DELETE endpoints.
| services.userlog.podDisruptionBudget
a| [subs=-attributes]
+object+
Expand Down
2 changes: 2 additions & 0 deletions charts/ocis/docs/values.adoc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1604,6 +1604,8 @@ services:
# if the proper store is selected
# addresses:
# - "{{ .appNameNats }}:9233"
# -- The secret to secure the global notifications endpoint. Only system admins and users knowing that secret can call the global notifications POST/DELETE endpoints.
notificationsSecret: ""
# -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set.
podDisruptionBudget: {}
# -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set.
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/userlog/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ spec:
{{- include "ocis.containerSecurityContext" . | nindent 10 }}
env:
{{- include "ocis.serviceRegistry" . | nindent 12 }}

- name: USERLOG_GLOBAL_NOTIFICATIONS_SECRET
value: {{ .Values.notificationsSecret | quote }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we get this from a Secret please? See eg. here:

ocis-charts/charts/ocis/templates/authmachine/deployment.yaml

Lines 59 to 63 in 5c854bc

- name: AUTH_MACHINE_API_KEY
valueFrom:
secretKeyRef:
name: {{ include "secrets.machineAuthAPIKeySecret" . }}
key: machine-auth-api-key

- name: USERLOG_LOG_COLOR
value: {{ .Values.logging.color | quote }}
- name: USERLOG_LOG_LEVEL
Expand Down
2 changes: 2 additions & 0 deletions charts/ocis/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1603,6 +1603,8 @@ services:
# if the proper store is selected
# addresses:
# - "{{ .appNameNats }}:9233"
# -- The secret to secure the global notifications endpoint. Only system admins and users knowing that secret can call the global notifications POST/DELETE endpoints.
notificationsSecret: ""
# -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set.
podDisruptionBudget: {}
# -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set.
Expand Down