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

NET-600 #2571

Merged
merged 2 commits into from
Sep 18, 2023
Merged

NET-600 #2571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c46df4
NET-600
uGiFarukh Sep 12, 2023
83654ea
NET-468 & NET-600
uGiFarukh Sep 12, 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
5 changes: 5 additions & 0 deletions controllers/ext_client.go
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

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

issue related to this ticket is totally different

Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,11 @@ func createExtClient(w http.ResponseWriter, r *http.Request) {
extclient.RemoteAccessClientID = customExtClient.RemoteAccessClientID
extclient.IngressGatewayID = nodeid

// set extclient dns to ingressdns if extclient dns is not explicitly set
if (extclient.DNS == "") && (node.IngressDNS != "") {
extclient.DNS = node.IngressDNS
}

extclient.Network = node.Network
host, err := logic.GetHost(node.HostID.String())
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion logic/extpeers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ func UpdateExtClient(old *models.ExtClient, update *models.CustomExtClient) mode
if update.PublicKey != "" && old.PublicKey != update.PublicKey {
new.PublicKey = update.PublicKey
}
if update.DNS != "" && update.DNS != old.DNS {
if update.DNS != old.DNS {
new.DNS = update.DNS
}
if update.Enabled != old.Enabled {
Expand Down