Skip to content

Comments

Fix Brig's configmap for SFT Lookup Templating#2015

Merged
mdimjasevic merged 2 commits intodevelopfrom
fs-266/fix-brig-templating
Dec 31, 2021
Merged

Fix Brig's configmap for SFT Lookup Templating#2015
mdimjasevic merged 2 commits intodevelopfrom
fs-266/fix-brig-templating

Conversation

@mdimjasevic
Copy link
Contributor

This is a follow-up to PR #2014 and part of https://wearezeta.atlassian.net/browse/FS-266. It fixes templating in Brig's configmap.

Checklist

  • The PR Title explains the impact of the change.
  • The PR description provides context as to why the change should occur and what the code contributes to that effect. This could also be a link to a JIRA ticket or a Github issue, if there is one.
  • changelog.d contains the following bits of information (details):
    • A file with the changelog entry in one or more suitable sub-sections. The sub-sections are marked by directories inside changelog.d.

@mdimjasevic mdimjasevic merged commit d540f9b into develop Dec 31, 2021
@mdimjasevic mdimjasevic deleted the fs-266/fix-brig-templating branch December 31, 2021 14:26
jschaul added a commit that referenced this pull request Jan 4, 2022
…ftd_disco sidecar process. (#2019)

Related to https://wearezeta.atlassian.net/browse/FS-266.

Implements querying the list of all SFT servers from the sftd's sidecar nginx pod. This is a different take on the above issue and if this list provided by sft servers is made use of; then that makes some of the work introduced in #2012 #2014 #2015 obsolete (sorry 😟 ). 

From brig, using the url configured in `setSftStaticUrl`, and calling `/sft_servers_all.json` on that URL, this PR provides a list of all SFT servers available. The list is computed on the SFTD chart itself (using a sftd_disco sidecar container). This has the advantage of allowing brig to be hosted on a separate kubernetes cluster to sftd, and moves the business logic of knowing sftd servers to sftd itself.

From a brig pod on a test cluster:

```
 # cat /etc/wire/brig/conf/brig.yaml | grep sft
  setSftStaticUrl: https://sftd.a.adhoc-testing.wire.link:443
/ # curl -ks https://sftd.a.adhoc-testing.wire.link:443/sft_servers_all.json
{
  "sft_servers_all": [
    "https://sftd.a.adhoc-testing.wire.link/sfts/wire-server-a-sftd-0"
  ]
}
```

Co-authored-by: Marko Dimjašević <marko.dimjasevic@wire.com>
@akshaymankar akshaymankar mentioned this pull request Jan 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants