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

fix the addresss of the BuildService #7367

Closed
wants to merge 8 commits into from
Closed

fix the addresss of the BuildService #7367

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a80617c
fix the addresss of the BuildService
TsuyoshiUshio May 12, 2021
f3f3d31
Move logic to EnvironmentExtensions with moving constant to the Envir…
TsuyoshiUshio May 12, 2021
a98395e
change to Data driven testing
TsuyoshiUshio May 12, 2021
5a27861
fix the protocol
TsuyoshiUshio May 12, 2021
d089622
Make it dry
TsuyoshiUshio May 12, 2021
b3469b3
fix failed test for integration
TsuyoshiUshio May 12, 2021
03c031c
add mock settings
TsuyoshiUshio May 13, 2021
46ef3d4
Skip the test for the hot fix
TsuyoshiUshio May 13, 2021
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
9 changes: 8 additions & 1 deletion src/WebJobs.Script.WebHost/Management/FunctionsSyncManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,14 @@ internal HttpRequestMessage BuildSetTriggersRequest()
var url = default(string);
if (_environment.IsKubernetesManagedHosting())
{
url = $"http://{ManagedKubernetesBuildServiceName}.{ManagedKubernetesBuildServiceNamespace}.svc.cluster.local:{ManagedKubernetesBuildServicePort}/operations/settriggers";
var buildServiceHostname =
_environment.GetEnvironmentVariable(EnvironmentSettingNames.BuildServiceHostname);

Copy link
Member

@pragnagopa pragnagopa May 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Move this to environment extensions and add tests

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.
Could you have a look? @pragnagopa

if (string.IsNullOrEmpty(buildServiceHostname))
{
buildServiceHostname = $"http://{ManagedKubernetesBuildServiceName}.{ManagedKubernetesBuildServiceNamespace}.svc.cluster.local:{ManagedKubernetesBuildServicePort}";
}
url = $"{buildServiceHostname}/api/operations/settriggers";
}
else
{
Expand Down
1 change: 1 addition & 0 deletions src/WebJobs.Script/Environment/EnvironmentSettingNames.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public static class EnvironmentSettingNames
public const string PodName = "POD_NAME";
public const string PodEncryptionKey = "POD_ENCRYPTION_KEY";
public const string HttpLeaderEndpoint = "HTTP_LEADER_ENDPOINT";
public const string BuildServiceHostname = "BUILD_SERVICE_HOSTNAME";

/// <summary>
/// Environment variable dynamically set by the platform when it is safe to
Expand Down