This repository has been archived by the owner on Aug 25, 2021. It is now read-only.
Reorganize externalServers section #430
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ishustava
added
the
theme/external-servers
ishustava
force-pushed
the
reorg-external-servers-section
branch
from
406cb31
to
3605470
Compare
* Consolidate client.join and externalServers.https.address under one value: externalServers.hosts. This value no longer accepts ports, and so if the serf port is non-default, it has to be provided separately. Since it no longer accepts ports, this value was renamed from 'address' to 'hosts'. This was largely based on RFC2396, which defined URL as '<userinfo>@<host>:<port>'. * Deprecate 'client.join'. * Add externalServers.serfLANPort. * Rename externalServers.https.port -> externalServers.httpsPort * Rename externalServers.https.tlsServerName -> externalServers.tlsServerName * Rename externalServers.https.useSystemRoots -> externalServers.useSystemRoots * Rename connectInject.overrideAuthMethodHost -> externalServers.k8sAuthMethodHost
ishustava
force-pushed
the
reorg-external-servers-section
branch
from
3605470
to
bb4506e
Compare
lkysow
approved these changes
Apr 23, 2020
Co-Authored-By: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Co-Authored-By: Luke Kysow <1034429+lkysow@users.noreply.github.com>
adilyse
reviewed
Apr 24, 2020
| {{- if .Values.client.join }} | ||
| {{- range $value := .Values.client.join }} | ||
| -retry-join={{ quote $value }} \ | ||
| {{- end }} | ||
| {{- else }} | ||
| {{- $serfPort := (.Values.externalServers.serfLANPort | int) -}} | ||
| {{- range $host := .Values.externalServers.hosts }} | ||
| -retry-join={{ printf "%s:%d" $host $serfPort | quote}} \ |
There was a problem hiding this comment.
Does this still work if someone set a provider? Or a dns name? I think the docs also mention being able to set a go-sockaddr template.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR makes the following changes:
client.joinandexternalServers.https.addressunder one value:externalServers.hosts. Unlikeclient.join, this value no longer accepts ports, and so if the serf port is non-default, it has to be provided separately. This is because we're now using the same host for multiple protocols, and so I think it's better to provide the ports for each protocol separately. Since it no longer accepts ports, I thoughthostswill be a more appropriate name for it. This was largely based on RFC2396,where URL is defined as
<userinfo>@<host>:<port>.client.join.externalServers.serfLANPort.externalServers.https.port->externalServers.httpsPortexternalServers.https.tlsServerName->externalServers.tlsServerNameexternalServers.https.useSystemRoots->externalServers.useSystemRootsconnectInject.overrideAuthMethodHost->externalServers.k8sAuthMethodHost