Skip to content

Commit 78d2dcb

Browse files
committed
Merge remote-tracking branch 'origin' into bdd/2024-reorg-andconsolidate
2 parents d552cc6 + c23d0ea commit 78d2dcb

File tree

5 files changed

+46
-8
lines changed

5 files changed

+46
-8
lines changed

content/docs/deploy/k8s/reference.md

+16
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,22 @@ PomeriumSpec defines Pomerium-specific configuration parameters.
107107
</td>
108108
</tr>
109109

110+
<tr>
111+
<td>
112+
<p>
113+
<code>codecType</code>&#160;&#160;
114+
115+
<strong>string</strong>&#160;
116+
117+
</p>
118+
<p>
119+
120+
CodecType sets the <a href="https://www.pomerium.com/docs/reference/codec-type">Codec Type</a>.
121+
</p>
122+
123+
</td>
124+
</tr>
125+
110126
<tr>
111127
<td>
112128
<p>

content/docs/internals/connection.mdx

+11-7
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,25 @@ import LongLivedConnections from '@site/content/docs/admonitions/_long-lived-con
1010

1111
# Connection Lifecycle
1212

13-
Pomerium enables proxying of HTTP and TCP connections, uniformly applying [access policies](/docs/capabilities/authorization) across these connections.
13+
Pomerium enables proxying of HTTP, TCP, and UDP traffic, uniformly applying [access policies](/docs/capabilities/authorization) across the routed traffic.
1414

1515
The primary focus of this document is the management of transport layer connections in Pomerium, particularly HTTP requests.
1616

17-
## HTTP and TCP connection lifecyle
17+
## HTTP connection lifecyle
1818

19-
### 1. **Downstream connection and TLS termination**
19+
TCP and UDP traffic is tunneled over HTTP, so let's focus on the HTTP connection lifecycle.
2020

21-
A client, usually a web browser, initiates a connection to Pomerium.
21+
### 1. **Downstream connection and TLS termination**
2222

23-
- This connection can be HTTP/1.1 or HTTP/2.
23+
- A client, usually a web browser, [Pomerium CLI](/docs/clients/pomerium-cli), or [Pomerium Desktop App](/docs/clients/pomerium-desktop), initiates a connection to Pomerium. This connection can be HTTP/1.1, HTTP/2, or HTTP/3.
2424

2525
:::tip **Note**
2626

27-
Pomerium currently does not support QUIC or HTTP/3 transports. Most modern browsers default to HTTP/2 connections for significant performance benefits. In rare circumstances, you may need to force HTTP/1.1 using the [`codec_type`](/docs/reference/codec-type) parameter.
27+
HTTP/2 and HTTP/1.1 are allowed by default, with most modern browsers defaulting to HTTP/2.
28+
29+
HTTP/3 can be enabled by setting the [`codec_type`](/docs/reference/codec-type) parameter. This is recommended when proxying UDP traffic.
30+
31+
In rare circumstances, you may need to force HTTP/1.1 using the [`codec_type`](/docs/reference/codec-type) parameter.
2832

2933
:::
3034

@@ -34,7 +38,7 @@ Pomerium currently does not support QUIC or HTTP/3 transports. Most modern brows
3438

3539
### 2. **Request initiation**
3640

37-
After the transport layer connection is established, the downstream client sends an HTTP request. The proxy parses this request, matches it against the configuration, and determines the upstream service to which the request should be forwarded.
41+
After TLS handshakes are complete, the downstream client sends an HTTP request. The proxy parses this request, matches it against the configured routes, and determines the upstream service to which the request should be forwarded.
3842

3943
### 3. **Request authorization**
4044

content/docs/reference/codec-type.mdx

+11-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,17 @@ CODEC_TYPE=http2
4545
</TabItem>
4646
<TabItem value="Kubernetes" label="Kubernetes">
4747

48-
Kubernetes does not support `codec_type`.
48+
| **[Parameter name](/docs/k8s/reference#spec)** | **Type** | **Usage** | **Default** |
49+
| :-- | :-- | :-- | :-- |
50+
| `codecType` | `string` | **optional** | `auto` |
51+
52+
### Examples
53+
54+
```yaml
55+
codecType: http2
56+
```
57+
58+
See [Kubernetes - Global Configuration](/docs/k8s/configure) for more information.
4959
5060
</TabItem>
5161
</Tabs>

content/docs/reference/reference.json

+7
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,13 @@
701701
"services": [],
702702
"type": "slice of string"
703703
},
704+
"jwt-groups-filter": {
705+
"id": "jwt-groups-filter",
706+
"title": "JWT Groups Filter",
707+
"description": "If set, filters the set of group memberships in the Pomerium JWT and Impersonate-Group headers to this subset of groups (based on an exact string match).",
708+
"services": [],
709+
"type": "array of string"
710+
},
704711
"override-certificate-name": {
705712
"id": "override-certificate-name",
706713
"title": "Override Certificate Name",

cspell.json

+1
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@
184184
"yubico",
185185
"yubikey",
186186
"zenefits",
187+
"zipkin",
187188
"webui",
188189
"OLLAMA",
189190
"zonefile",

0 commit comments

Comments
 (0)