fixup

pilot/pkg/networking/core/cluster.go

@@ -42,6 +42,7 @@ import (
  "istio.io/istio/pkg/log"
  "istio.io/istio/pkg/security"
  netutil "istio.io/istio/pkg/util/net"
+ "istio.io/istio/pkg/util/protomarshal"
  "istio.io/istio/pkg/util/sets"
 )
 
@@ -378,6 +379,8 @@ func (p clusterPatcher) patch(hosts []host.Name, c *cluster.Cluster) *discovery.
  if cluster == nil {
  return nil
  }
+ v, _ := protomarshal.MarshalIndent(c, " ")
+ log.Errorf("howardjohn: %v", string(v))
  return &discovery.Resource{Name: cluster.Name, Resource: protoconv.MessageToAny(cluster)}
 }
 

pilot/pkg/networking/core/cluster_tls.go

@@ -80,9 +80,11 @@ var hboneTransportSocket = &cluster.Cluster_TransportSocketMatch{
  TransportSocket: internalUpstreamSocket,
 }
 
-var hboneOrPlaintextSocket = []*cluster.Cluster_TransportSocketMatch{
- hboneTransportSocket,
- defaultTransportSocketMatch(),
+func hboneOrPlaintextSocket() []*cluster.Cluster_TransportSocketMatch {
+ return []*cluster.Cluster_TransportSocketMatch{
+ hboneTransportSocket,
+ defaultTransportSocketMatch(),
+ }
 }
 
 // applyUpstreamTLSSettings applies upstream tls context to the cluster
@@ -358,7 +360,7 @@ func (cb *ClusterBuilder) applyHBONETransportSocketMatches(c *cluster.Cluster, t
  istioAutoDetectedMtls bool,
 ) {
  if tls == nil {
- c.TransportSocketMatches = hboneOrPlaintextSocket
+ c.TransportSocketMatches = hboneOrPlaintextSocket()
  return
  }
  // For headless service, discovery type will be `Cluster_ORIGINAL_DST`
@@ -379,7 +381,7 @@ func (cb *ClusterBuilder) applyHBONETransportSocketMatches(c *cluster.Cluster, t
  }
  } else {
  if c.TransportSocket == nil {
- c.TransportSocketMatches = hboneOrPlaintextSocket
+ c.TransportSocketMatches = hboneOrPlaintextSocket()
  } else {
  ts := c.TransportSocket
  c.TransportSocket = nil

pilot/pkg/networking/core/cluster_traffic_policy.go

@@ -481,7 +481,7 @@ func (cb *ClusterBuilder) applyUpstreamProxyProtocol(
  Name: "envoy.transport_sockets.upstream_proxy_protocol",
  ConfigType: &core.TransportSocket_TypedConfig{TypedConfig: protoconv.MessageToAny(&proxyprotocol.ProxyProtocolUpstreamTransport{
  Config: &core.ProxyProtocolConfig{Version: core.ProxyProtocolConfig_Version(proxyProtocol.Version)},
- TransportSocket: util.RawBufferTransport,
+ TransportSocket: util.RawBufferTransport(),
  })},
  }
  return

pilot/pkg/networking/core/cluster_waypoint.go

@@ -168,7 +168,7 @@ func (cb *ClusterBuilder) buildWaypointInboundVIPCluster(
  clusterMode: DefaultClusterMode,
  direction: model.TrafficDirectionInboundVIP,
  }
- transportSocket := util.RawBufferTransport
+ transportSocket := util.RawBufferTransport()
  if tlsContext := buildWaypointTLSContext(opts, tls); tlsContext != nil {
  transportSocket = &core.TransportSocket{
  Name: "internal_upstream",

pilot/pkg/networking/util/internal_upstream.go

@@ -30,15 +30,17 @@ var TunnelHostMetadata = []*internalupstream.InternalUpstreamTransport_MetadataV
  },
 }
 
-var RawBufferTransport = &core.TransportSocket{
- Name: "raw_buffer",
- ConfigType: &core.TransportSocket_TypedConfig{TypedConfig: protoconv.MessageToAny(&rawbuffer.RawBuffer{})},
+func RawBufferTransport() *core.TransportSocket {
+ return &core.TransportSocket{
+ Name: "raw_buffer",
+ ConfigType: &core.TransportSocket_TypedConfig{TypedConfig: protoconv.MessageToAny(&rawbuffer.RawBuffer{})},
+ }
 }
 
 var DefaultInternalUpstreamTransportSocket = &core.TransportSocket{
  Name: "internal_upstream",
  ConfigType: &core.TransportSocket_TypedConfig{TypedConfig: protoconv.MessageToAny(&internalupstream.InternalUpstreamTransport{
- TransportSocket: RawBufferTransport,
+ TransportSocket: RawBufferTransport(),
  })},
 }
 

tests/integration/ambient/baseline_test.go

@@ -1432,9 +1432,9 @@ spec:
  }, originateTLSTmpl).ApplyOrFail(t)
  src.CallOrFail(t, echo.CallOptions{
  To: dst,
- Port: dst.PortForName("http"),
+ Port: ports.HTTPWithProxy,
  Scheme: scheme.HTTP,
- //NewConnectionPerRequest: true,
+ // NewConnectionPerRequest: true,
  })
  })
  }