Skip to content

fix(helm): map the connector key ring on its own flag; staging gets its own ring #2533

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

Merged
lilyshen0722 merged 1 commit into from
Oct 23, 2026
Merged

fix(helm): map the connector key ring on its own flag; staging gets its own ring #2533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions k8s/helm/commonly/templates/secrets/api-keys.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ spec:
- secretKey: slack-signing-secret
remoteRef:
key: {{ $keyPrefix }}slack-signing-secret
{{- end }}
{{- if or .Values.slack.oauth.enabled .Values.connectorSecrets.enabled }}
# Connector secret key ring (keyId:base64,...). Every hosted-MCP and Slack connection is
# encrypted with it, so it can't stay tied to Slack OAuth: staging (Slack off) had no ring and
# every hosted-MCP callback threw. Both remote keys must exist before enabling.
- secretKey: connector-secret-keys
remoteRef:
key: {{ $keyPrefix }}connector-secret-keys
Expand Down
5 changes: 5 additions & 0 deletions k8s/helm/commonly/values-staging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,3 +205,8 @@ mongodb:
key: workload-tier
operator: Equal
value: spot

# Staging-only connector key ring (commonly-staging-connector-secret-keys / -active-key in SM,
# fresh keys, never prod's). Without it every hosted-MCP OAuth callback on staging threw.
connectorSecrets:
enabled: true
5 changes: 5 additions & 0 deletions k8s/helm/commonly/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ slack:
oauth:
enabled: false

# Connector secret key ring in api-keys (connector-secret-keys + -active-key). Also mapped
# whenever slack.oauth.enabled is on. Turn on for any instance that offers hosted-MCP connectors.
connectorSecrets:
enabled: false

# Google Calendar's hosted-MCP entry uses a pre-registered OAuth client
# (backend/integrations/hostedMcp/googleCalendar.ts). The backend reads
# GOOGLE_CALENDAR_CLIENT_ID / GOOGLE_CALENDAR_CLIENT_SECRET, the names
Expand Down
Loading