Skip to content

Fix missing proxy address in GCP and Azure VM auto-discovery #36971

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

Merged
atburke merged 2 commits into from
Jan 24, 2024
Merged

Fix missing proxy address in GCP and Azure VM auto-discovery #36971

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
ce571a0
Fix missing proxy addr for GCP+Azure discovery
atburke Jan 20, 2024
d23381f
Merge branch 'master' into atburke/discovery-proxy-addr
atburke Jan 24, 2024
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
27 changes: 16 additions & 11 deletions lib/config/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,16 +1545,18 @@ func applyDiscoveryConfig(fc *FileConfig, cfg *servicecfg.Config) error {

for _, matcher := range fc.Discovery.AzureMatchers {
var installerParams *types.InstallerParams
if matcher.InstallParams != nil {
if slices.Contains(matcher.Types, types.AzureMatcherVM) {
installerParams = &types.InstallerParams{
JoinMethod: matcher.InstallParams.JoinParams.Method,
JoinToken: matcher.InstallParams.JoinParams.TokenName,
ScriptName: matcher.InstallParams.ScriptName,
PublicProxyAddr: getInstallerProxyAddr(matcher.InstallParams, fc),
}
if matcher.InstallParams.Azure != nil {
installerParams.Azure = &types.AzureInstallerParams{
ClientID: matcher.InstallParams.Azure.ClientID,
if matcher.InstallParams != nil {
installerParams.JoinMethod = matcher.InstallParams.JoinParams.Method
installerParams.JoinToken = matcher.InstallParams.JoinParams.TokenName
installerParams.ScriptName = matcher.InstallParams.ScriptName
if matcher.InstallParams.Azure != nil {
installerParams.Azure = &types.AzureInstallerParams{
ClientID: matcher.InstallParams.Azure.ClientID,
}
}
}
}
Expand All @@ -1576,14 +1578,17 @@ func applyDiscoveryConfig(fc *FileConfig, cfg *servicecfg.Config) error {

for _, matcher := range fc.Discovery.GCPMatchers {
var installerParams *types.InstallerParams
if matcher.InstallParams != nil {
if slices.Contains(matcher.Types, types.GCPMatcherCompute) {
installerParams = &types.InstallerParams{
JoinMethod: matcher.InstallParams.JoinParams.Method,
JoinToken: matcher.InstallParams.JoinParams.TokenName,
ScriptName: matcher.InstallParams.ScriptName,
PublicProxyAddr: getInstallerProxyAddr(matcher.InstallParams, fc),
}
if matcher.InstallParams != nil {
installerParams.JoinMethod = matcher.InstallParams.JoinParams.Method
installerParams.JoinToken = matcher.InstallParams.JoinParams.TokenName
installerParams.ScriptName = matcher.InstallParams.ScriptName
}
}

serviceMatcher := types.GCPMatcher{
Types: matcher.Types,
Locations: matcher.Locations,
Expand Down
26 changes: 19 additions & 7 deletions lib/config/configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4304,6 +4304,11 @@ func TestDiscoveryConfig(t *testing.T) {
"service_accounts": []string{"a@example.com", "b@example.com"},
},
}
cfg["version"] = "v3"
cfg["teleport"].(cfgMap)["proxy_server"] = "example.com"
cfg["proxy_service"] = cfgMap{
"enabled": "no",
}
},
expectedGCPMatchers: []types.GCPMatcher{{
Types: []string{"gce"},
Expand All @@ -4317,9 +4322,10 @@ func TestDiscoveryConfig(t *testing.T) {
ProjectIDs: []string{"p1", "p2"},
ServiceAccounts: []string{"a@example.com", "b@example.com"},
Params: &types.InstallerParams{
JoinMethod: types.JoinMethodGCP,
JoinToken: types.GCPInviteTokenName,
ScriptName: installers.InstallerScriptName,
JoinMethod: types.JoinMethodGCP,
JoinToken: types.GCPInviteTokenName,
ScriptName: installers.InstallerScriptName,
PublicProxyAddr: "example.com",
},
}},
},
Expand Down Expand Up @@ -4632,6 +4638,11 @@ func TestDiscoveryConfig(t *testing.T) {
},
},
}
cfg["version"] = "v3"
cfg["teleport"].(cfgMap)["proxy_server"] = "example.com"
cfg["proxy_service"] = cfgMap{
"enabled": "no",
}
},
expectedAzureMatchers: []types.AzureMatcher{{
Types: []string{"vm"},
Expand All @@ -4642,10 +4653,11 @@ func TestDiscoveryConfig(t *testing.T) {
"discover_teleport": []string{"yes"},
},
Params: &types.InstallerParams{
JoinMethod: "azure",
JoinToken: "azure-discovery-token",
ScriptName: "default-installer",
Azure: &types.AzureInstallerParams{},
JoinMethod: "azure",
JoinToken: "azure-discovery-token",
ScriptName: "default-installer",
PublicProxyAddr: "example.com",
Azure: &types.AzureInstallerParams{},
},
}},
},
Expand Down