chore: Add support for AdditionalURLs field in server settings query (#…

…21045) Helps with #18642 Needed for consistency and for future testing in another PR. Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com>
argoproj · Dec 3, 2024 · 9757866 · 9757866
1 parent 52dbe51
commit 9757866
Show file tree

Hide file tree

Showing 4 changed files with 146 additions and 80 deletions.
diff --git a/assets/swagger.json b/assets/swagger.json
diff --git a/pkg/apiclient/settings/settings.pb.go b/pkg/apiclient/settings/settings.pb.go
diff --git a/server/settings/settings.go b/server/settings/settings.go
@@ -90,6 +90,7 @@ func (s *Server) Get(ctx context.Context, q *settingspkg.SettingsQuery) (*settin
 
 	set := settingspkg.Settings{
 		URL:                argoCDSettings.URL,
+		AdditionalURLs:     argoCDSettings.AdditionalURLs,
 		AppLabelKey:        appInstanceLabelKey,
 		ResourceOverrides:  overrides,
 		StatusBadgeEnabled: argoCDSettings.StatusBadgeEnabled,

diff --git a/server/settings/settings.proto b/server/settings/settings.proto
@@ -44,6 +44,7 @@ message Settings {
     bool appsInAnyNamespaceEnabled = 24;
     bool impersonationEnabled = 25;
     string installationID = 26;
+    repeated string additionalUrls = 27 [(gogoproto.customname) = "AdditionalURLs"];
 }
 
 message GoogleAnalyticsConfig {