Merge pull request #5067 from openshift-cherrypick-robot/cherry-pick-…

…5057-to-release-4.14 [release-4.14] OCPBUGS-44279: Configure OAuth https proxy to dial cloud endpoints directly
openshift · Nov 21, 2024 · 65bc332 · 65bc332
2 parents 235f952 + a1eea7b
commit 65bc332
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/control-plane-operator/controllers/hostedcontrolplane/oauth/deployment.go b/control-plane-operator/controllers/hostedcontrolplane/oauth/deployment.go
@@ -233,7 +233,7 @@ func buildOAuthContainerHTTPProxy(image string, proxyConfig *configv1.ProxySpec,
 	return func(c *corev1.Container) {
 		c.Image = image
 		c.Command = []string{"/usr/bin/control-plane-operator", "konnectivity-https-proxy"}
-		c.Args = []string{"run", fmt.Sprintf("--serving-port=%d", httpKonnectivityProxyPort)}
+		c.Args = []string{"run", fmt.Sprintf("--serving-port=%d", httpKonnectivityProxyPort), "--connect-directly-to-cloud-apis"}
 		if proxyConfig != nil {
 			c.Args = append(c.Args, "--http-proxy", proxyConfig.HTTPProxy)
 			c.Args = append(c.Args, "--https-proxy", proxyConfig.HTTPSProxy)

diff --git a/...s/hostedcontrolplane/oauth/testdata/zz_fixture_TestReconcileOauthDeploymentNoChanges.yaml b/...s/hostedcontrolplane/oauth/testdata/zz_fixture_TestReconcileOauthDeploymentNoChanges.yaml
@@ -105,6 +105,7 @@ spec:
       - args:
         - run
         - --serving-port=8092
+        - --connect-directly-to-cloud-apis
         command:
         - /usr/bin/control-plane-operator
         - konnectivity-https-proxy