UpstreamTlsContext disappears when httpProxyHostname is added

[bdecoste]

Gloo Edge Version

1.11.x

Kubernetes Version

No response

Describe the bug

When an upstream is configured with sslConfig or static.useTls: true the envoy cluster is correctly configured with an UpstreamTlsContext. When httpProxyHostname is added, the UpstreamTlsContext is removed and calls through the tunnel to an https target will fail with The plain HTTP request was sent to HTTPS port

Steps to reproduce the bug

apiVersion: gloo.solo.io/v1
kind: Upstream
metadata:
  name: connect
  namespace: gloo-system
spec:
  httpProxyHostname: postman-echo.com:443
  static:
    hosts:
    - addr: goproxy.default.svc.cluster.local
      port: 8080
    useTls: true

Expected Behavior

An HTTPS request is sent through the tunnel when sslConfig or static.useTls:true is configured.

Additional Context

No response

[jbohanon]

Reopening until backports completed

[jbohanon]

This functionality is released in the following Gloo OSS versions:

• v1.9.30
• v1.10.41
• v1.11.45
• v1.12.35
• v1.13.0-beta26

and the following Gloo EE versions:

• v1.9.27
• v1.10.33
• v1.11.49
• v1.12.36
• v1.13.0-beta11