Skip to content

WPB-6524 Added optional api proxy attribute to deeplink json in nginz chart#3933

Merged
battermann merged 2 commits intodevelopfrom
WPB-6524-nginz-helm-chart-is-missing-the-proxy-attributes-for-generating-a-deeplink-json
Mar 11, 2024
Merged

WPB-6524 Added optional api proxy attribute to deeplink json in nginz chart#3933
battermann merged 2 commits intodevelopfrom
WPB-6524-nginz-helm-chart-is-missing-the-proxy-attributes-for-generating-a-deeplink-json

Conversation

@battermann
Copy link
Contributor

@battermann battermann commented Mar 8, 2024

https://wearezeta.atlassian.net/browse/WPB-6524

Test like this:

cd into charts

create file nginz-overrides.yaml

echo 'nginx_conf:
  deeplink:
    endpoints:
      backendURL: "https://prod-nginz-https.wire.com"
      backendWSURL: "https://prod-nginz-ssl.wire.com"
      blackListURL: "https://clientblacklist.wire.com/prod"
      teamsURL: "https://teams.wire.com"
      accountsURL: "https://accounts.wire.com"
      websiteURL: "https://wire.com"
    title: "Leif Test"
    apiProxy: # (optional)
      host: "socks5.proxy.com"
      port: 1080
      needsAuthentication: true' > nginz-overrides.yaml

create file nginz-secrets.yaml

echo 'secrets:
  basicAuth: "whatever"
  zAuth:
    # this must match the key in brig!
    publicKeys: 0UW38se1yeoc5bVNEvf5LyrHWGZkyvcGTVilK2geGdU=
  oAuth:
    publicKeys: |
      {
        "kty": "OKP",
        "crv": "Ed25519",
        "x": "mhP-NgFw3ifIXGZqJVB0kemt9L3BtD5P8q4Gah4Iklc"
      }' > nginz-secrets.yaml

run

helm template --debug -f nginz-secrets.yaml -f nginz-overrides.yaml ./nginz

produces:

...
  deeplink.json: |2    
    
    {
      "endpoints" : {
          "backendURL" : "https://prod-nginz-https.wire.com",
          "backendWSURL": "https://prod-nginz-ssl.wire.com",
          "blackListURL": "https://clientblacklist.wire.com/prod",
          "teamsURL": "https://teams.wire.com",
          "accountsURL": "https://accounts.wire.com",
          "websiteURL": "https://wire.com"
       },
       "apiProxy" : {
          "host" : "socks5.proxy.com",
          "port" : 1080,
          "needsAuthentication" : true
       },
       "title" : "Leif Test"
    }
...

Checklist

  • Test with helm template
  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Mar 8, 2024
@battermann battermann marked this pull request as ready for review March 8, 2024 11:51
@battermann battermann merged commit 387fc9d into develop Mar 11, 2024
@battermann battermann deleted the WPB-6524-nginz-helm-chart-is-missing-the-proxy-attributes-for-generating-a-deeplink-json branch March 11, 2024 16:04
@echoes-hq echoes-hq bot added the echoes: unplanned Any work item that isn’t part of the product or technical roadmap. label Jul 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

echoes: unplanned Any work item that isn’t part of the product or technical roadmap. ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants