Skip to content

Commit faa36e5

Browse files
author
soloio-bot
committed
Sync Gloo APIs. Destination Branch: gloo-main
1 parent b2b595b commit faa36e5

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

api/gloo/gloo/v1/enterprise/options/jwt/jwt.proto

+3
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ message RemoteJwks {
124124
// This is used to set the host and path in the request
125125
string url = 1;
126126
// The Upstream representing the Json Web Key Set server
127+
//
128+
// Note: Setting this to an upstream using an HTTP tunnel (`httpProxyHostname`)
129+
// requires also using that upstream in a route.
127130
core.solo.io.ResourceRef upstream_ref = 2;
128131
// Duration after which the cached JWKS should be expired.
129132
// If not specified, default cache duration is 5 minutes.

api/gloo/gloo/v1/upstream.proto

+5-3
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,10 @@ message UpstreamSpec {
131131
// See [RFC7540, sec. 8.1](https://datatracker.ietf.org/doc/html/rfc7540#section-8.1) for details.
132132
google.protobuf.BoolValue override_stream_error_on_invalid_http_message = 26;
133133

134-
// Tells envoy that the upstream is an HTTP proxy (e.g., another proxy in a DMZ) that supports HTTP Connect.
135-
// This configuration sets the hostname used as part of the HTTP Connect request.
134+
// Tells Envoy that the upstream is an HTTP proxy that supports [HTTP CONNECT method](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/CONNECT).
135+
// The hostname is the destination of the tunnel established by the proxy.
136+
// Some Envoy Command Operators (.e.g `%REQUESTED_SERVER_NAME%`) are supported allowing for dynamic destinations.
137+
//
136138
// For example, setting to: host.com:443 and making a request routed to the upstream such as `curl <envoy>:<port>/v1`
137139
// would result in the following request:
138140
//
@@ -144,7 +146,7 @@ message UpstreamSpec {
144146
// user-agent: curl/7.64.1
145147
// accept: */*
146148
//
147-
// Note: if setting this field to a hostname rather than IP:PORT, you may want to also set `host_rewrite` on the route
149+
// Note: If setting this field to a hostname rather than IP:PORT, you may want to also set `host_rewrite` on the route
148150
google.protobuf.StringValue http_proxy_hostname = 21;
149151

150152
// HttpConnectSslConfig contains the options necessary to configure envoy to originate TLS to an HTTP Connect proxy.

pkg/api/gloo.solo.io/v1/enterprise/options/jwt/jwt.pb.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/gloo.solo.io/v1/upstream.pb.go

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)