Skip to content

Commit bfd557a

Browse files
olix0rolix0r
authored
chore: bump dev from v42 to v44 (#99)
* chore: bump dev from v42 to v44 * chore: pin ubuntu-22.04
1 parent b5a5323 commit bfd557a

File tree

8 files changed

+54
-51
lines changed

8 files changed

+54
-51
lines changed

‎.devcontainer/devcontainer.json

+18-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
{
22
"name": "k8s-gateway-api",
3-
"image": "ghcr.io/linkerd/dev:v42",
4-
"extensions": [
5-
"DavidAnson.vscode-markdownlint",
6-
"kokakiwi.vscode-just",
7-
"NathanRidley.autotrim",
8-
"rust-lang.rust-analyzer",
9-
"samverschueren.final-newline",
10-
"tamasfe.even-better-toml",
11-
],
3+
"image": "ghcr.io/linkerd/dev:v44",
124
"runArgs": [
135
"--init",
146
// Use the host network so we can access k3d, etc.
@@ -25,5 +17,21 @@
2517
"target": "/var/run/docker-host.sock",
2618
"type": "bind"
2719
}
28-
]
20+
],
21+
"features": {
22+
"ghcr.io/devcontainers/features/github-cli:1": {}
23+
},
24+
"customizations": {
25+
"vscode": {
26+
"extensions": [
27+
"github.vscode-github-actions",
28+
"kokakiwi.vscode-just",
29+
"NathanRidley.autotrim",
30+
"rust-lang.rust-analyzer",
31+
"ms-kubernetes-tools.vscode-kubernetes-tools",
32+
"samverschueren.final-newline",
33+
"tamasfe.even-better-toml"
34+
]
35+
}
36+
}
2937
}

‎.github/workflows/actions.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ permissions:
1111

1212
jobs:
1313
actionlint:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515
timeout-minutes: 10
1616
steps:
1717
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
18-
- uses: linkerd/dev/actions/setup-tools@v42
18+
- uses: linkerd/dev/actions/setup-tools@v44
1919
- run: just-dev lint-actions
2020

2121
devcontainer-versions:
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-22.04
2323
steps:
2424
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
25-
- uses: linkerd/dev/actions/setup-tools@v42
25+
- uses: linkerd/dev/actions/setup-tools@v44
2626
- run: just-dev check-action-images

‎.github/workflows/integration.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,27 @@ env:
1414
CARGO_INCREMENTAL: 0
1515
CARGO_NET_RETRY: 10
1616
RUSTUP_MAX_RETRIES: 10
17-
RUST_VERSION: 1.64.0
18-
K3D_VERSION: v5.4.6
1917
K3D_CREATE_FLAGS: '--no-lb'
2018
K3S_DISABLE: 'local-storage,traefik,servicelb,metrics-server@server:*'
21-
NEXTEST_VERSION: '0.9.42'
19+
NEXTEST_VERSION: '0.9.85'
2220

2321
jobs:
2422
test:
2523
strategy:
2624
matrix:
2725
k8s:
2826
- v1.22
29-
- v1.28
27+
- v1.31
3028
timeout-minutes: 10
31-
runs-on: ubuntu-latest
29+
runs-on: ubuntu-22.04
3230
env:
3331
K8S_CHANNEL: ${{ matrix.k8s }}
3432
steps:
3533
# Install just* tooling
36-
- uses: linkerd/dev/actions/setup-tools@v42
34+
- uses: linkerd/dev/actions/setup-tools@v44
3735
# Configure the default Rust toolchain
38-
- uses: linkerd/dev/actions/setup-rust@v42
36+
- uses: linkerd/dev/actions/setup-rust@v44
3937
# Setup a cluster
40-
- run: curl --proto =https --tlsv1.3 -fLsSv "https://raw.githubusercontent.com/k3d-io/k3d/${K3D_VERSION}/install.sh" | bash
4138
- run: k3d --version
4239
- run: just-k3d create
4340
- run: kubectl version

‎.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ env:
1818
jobs:
1919
lint:
2020
timeout-minutes: 5
21-
runs-on: ubuntu-latest
22-
container: docker://ghcr.io/linkerd/dev:v42-rust
21+
runs-on: ubuntu-22.04
22+
container: docker://ghcr.io/linkerd/dev:v44-rust
2323
steps:
2424
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
2525
- run: just fetch

‎.github/workflows/markdown.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
markdownlint:
1414
timeout-minutes: 5
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-22.04
1616
steps:
1717
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
1818
- uses: DavidAnson/markdownlint-cli2-action@455b6612a7b7a80f28be9e019b70abdd11696e4e

‎.github/workflows/release.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919
jobs:
2020
meta:
2121
timeout-minutes: 5
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-22.04
2323
steps:
2424
- id: meta
2525
shell: bash
@@ -40,8 +40,8 @@ jobs:
4040

4141
test:
4242
timeout-minutes: 5
43-
runs-on: ubuntu-latest
44-
container: docker://ghcr.io/linkerd/dev:v42-rust
43+
runs-on: ubuntu-22.04
44+
container: docker://ghcr.io/linkerd/dev:v44-rust
4545
steps:
4646
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
4747
- run: just fetch
@@ -54,8 +54,8 @@ jobs:
5454
permissions:
5555
contents: write
5656
timeout-minutes: 5
57-
runs-on: ubuntu-latest
58-
container: docker://ghcr.io/linkerd/dev:v42-rust
57+
runs-on: ubuntu-22.04
58+
container: docker://ghcr.io/linkerd/dev:v44-rust
5959
steps:
6060
- if: needs.meta.outputs.publish
6161
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
@@ -79,8 +79,8 @@ jobs:
7979
# Only publish the crate after the rest of the release succeeds.
8080
needs: [meta, release]
8181
timeout-minutes: 10
82-
runs-on: ubuntu-latest
83-
container: docker://ghcr.io/linkerd/dev:v42-rust
82+
runs-on: ubuntu-22.04
83+
container: docker://ghcr.io/linkerd/dev:v44-rust
8484
steps:
8585
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
8686
- if: needs.meta.outputs.publish == ''

‎src/gateway.rs

+10-12
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,12 @@ pub struct GatewaySpec {
3737
/// with each other if all of the following conditions are met:
3838
///
3939
/// 1. Either each Listener within the group specifies the "HTTP" Protocol or
40-
/// each Listener within the group specifies either the "HTTPS" or "TLS"
41-
/// Protocol.
42-
///
40+
/// each Listener within the group specifies either the "HTTPS" or "TLS"
41+
/// Protocol.
4342
/// 2. Each Listener within the group specifies a Hostname that is unique
44-
/// within the group.
45-
///
43+
/// within the group.
4644
/// 3. As a special case, one Listener within a group may omit Hostname, in
47-
/// which case this Listener matches when no other Listener matches.
45+
/// which case this Listener matches when no other Listener matches.
4846
///
4947
/// If the implementation does collapse compatible Listeners, the hostname
5048
/// provided in the incoming client request MUST be matched to a Listener to
@@ -105,12 +103,12 @@ pub struct Listener {
105103
/// Implementations MUST apply Hostname matching appropriately for each of
106104
/// the following protocols:
107105
///
108-
/// * TLS: The Listener Hostname MUST match the SNI. * HTTP: The Listener
109-
/// Hostname MUST match the Host header of the request. * HTTPS: The
110-
/// Listener Hostname SHOULD match at both the TLS and HTTP protocol layers
111-
/// as described above. If an implementation does not ensure that both the
112-
/// SNI and Host header match the Listener hostname, it MUST clearly document
113-
/// that.
106+
/// * TLS: The Listener Hostname MUST match the SNI.
107+
/// * HTTP: The Listener Hostname MUST match the Host header of the request.
108+
/// * HTTPS: The Listener Hostname SHOULD match at both the TLS and HTTP protocol
109+
/// layers as described above. If an implementation does not ensure that both the
110+
/// SNI and Host header match the Listener hostname, it MUST clearly document
111+
/// that.
114112
///
115113
/// For HTTPRoute and TLSRoute resources, there is an interaction with the
116114
/// `spec.hostnames` array. When both listener and route specify hostnames,

‎src/shared.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ pub struct ParentReference {
4040
/// following resources, SectionName is interpreted as the following:
4141
///
4242
/// * Gateway: Listener Name. When both Port (experimental) and SectionName
43-
/// are specified, the name and port of the selected listener must match
44-
/// both specified values.
43+
/// are specified, the name and port of the selected listener must match
44+
/// both specified values.
4545
///
4646
/// Implementations MAY choose to support attaching Routes to other
4747
/// resources. If that is the case, they MUST clearly document how
@@ -64,11 +64,11 @@ pub struct ParentReference {
6464
/// differently based on the type of parent resource:
6565
///
6666
/// * Gateway: All listeners listening on the specified port that also
67-
/// support this kind of Route(and select this Route). It's not recommended
68-
/// to set `Port` unless the networking behaviors specified in a Route must
69-
/// apply to a specific port as opposed to a listener(s) whose port(s) may
70-
/// be changed. When both Port and SectionName are specified, the name and
71-
/// port of the selected listener must match both specified values.
67+
/// support this kind of Route(and select this Route). It's not recommended
68+
/// to set `Port` unless the networking behaviors specified in a Route must
69+
/// apply to a specific port as opposed to a listener(s) whose port(s) may
70+
/// be changed. When both Port and SectionName are specified, the name and
71+
/// port of the selected listener must match both specified values.
7272
///
7373
/// Implementations MAY choose to support other parent resources.
7474
/// Implementations supporting other types of parent resources MUST clearly

0 commit comments

Comments
 (0)