From 7ca80f10f092c701989887e49937bcbf58adb5c3 Mon Sep 17 00:00:00 2001 From: Angel Misevski Date: Thu, 9 Jun 2022 11:49:07 -0400 Subject: [PATCH] Merge proxy configs on start when running in OpenShift Make sure we merge both the dwoc proxy config and the cluster proxy config on OpenShift to avoid an issue where we ignore the cluster proxy if the dwoc contains a proxy config on start. Signed-off-by: Angel Misevski --- pkg/config/sync.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/config/sync.go b/pkg/config/sync.go index ca9c63c38..fcf6a250b 100644 --- a/pkg/config/sync.go +++ b/pkg/config/sync.go @@ -91,9 +91,7 @@ func SetupControllerConfig(client crclient.Client) error { return err } defaultConfig.Routing.ProxyConfig = clusterProxy - if internalConfig.Routing.ProxyConfig == nil { - internalConfig.Routing.ProxyConfig = clusterProxy - } + internalConfig.Routing.ProxyConfig = proxy.MergeProxyConfigs(clusterProxy, internalConfig.Routing.ProxyConfig) updatePublicConfig() return nil