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

Only include file with external ip if AdvertiseExternalIP is true. #282

Merged
merged 1 commit into from
Aug 24, 2020
Merged

Only include file with external ip if AdvertiseExternalIP is true. #282

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
10 changes: 7 additions & 3 deletions pkg/util/kubernetes/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,14 +385,18 @@ func addGatewayConfig(sconfig *natsconf.ServerConfig, cluster v1alpha2.ClusterSp
Port: cluster.GatewayConfig.Port,
Gateways: gateways,
RejectUnknown: cluster.GatewayConfig.RejectUnknown,
Include: filepath.Join(".", constants.BootConfigGatewayFilePath),
}
if cluster.Pod != nil && cluster.Pod.AdvertiseExternalIP {
sconfig.Gateway.Include = filepath.Join(".", constants.BootConfigGatewayFilePath)
}

// Add the same for leaf nodes if present
if cluster.LeafNodeConfig != nil {
sconfig.LeafNode = &natsconf.LeafNodeServerConfig{
Port: cluster.LeafNodeConfig.Port,
Include: "./advertise/gateway_advertise.conf",
Port: cluster.LeafNodeConfig.Port,
}
if cluster.Pod != nil && cluster.Pod.AdvertiseExternalIP {
sconfig.LeafNode.Include = filepath.Join(".", constants.BootConfigGatewayFilePath)
}
}
return
Expand Down