diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ab1c732..1923053 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "k8s-gateway-api", - "image": "ghcr.io/linkerd/dev:v39", + "image": "ghcr.io/linkerd/dev:v42", "extensions": [ "DavidAnson.vscode-markdownlint", "kokakiwi.vscode-just", @@ -26,4 +26,4 @@ "type": "bind" } ] -} \ No newline at end of file +} diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 40c8fab..16eb80c 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -15,12 +15,12 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - - uses: linkerd/dev/actions/setup-tools@v39 + - uses: linkerd/dev/actions/setup-tools@v42 - run: just-dev lint-actions devcontainer-versions: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - - uses: linkerd/dev/actions/setup-tools@v39 + - uses: linkerd/dev/actions/setup-tools@v42 - run: just-dev check-action-images diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index d74a554..bb3d444 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -33,9 +33,9 @@ jobs: K8S_CHANNEL: ${{ matrix.k8s }} steps: # Install just* tooling - - uses: linkerd/dev/actions/setup-tools@v39 + - uses: linkerd/dev/actions/setup-tools@v42 # Configure the default Rust toolchain - - uses: linkerd/dev/actions/setup-rust@v39 + - uses: linkerd/dev/actions/setup-rust@v42 # Setup a cluster - run: curl --proto =https --tlsv1.3 -fLsSv "https://raw.githubusercontent.com/k3d-io/k3d/${K3D_VERSION}/install.sh" | bash - run: k3d --version diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a024328..7508d99 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: lint: timeout-minutes: 20 runs-on: ubuntu-latest - container: docker://ghcr.io/linkerd/dev:v39-rust + container: docker://ghcr.io/linkerd/dev:v42-rust steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - run: just fetch diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5c8a040..6a81716 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: test: timeout-minutes: 5 runs-on: ubuntu-latest - container: docker://ghcr.io/linkerd/dev:v39-rust + container: docker://ghcr.io/linkerd/dev:v42-rust steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - run: just fetch @@ -55,7 +55,7 @@ jobs: contents: write timeout-minutes: 5 runs-on: ubuntu-latest - container: docker://ghcr.io/linkerd/dev:v39-rust + container: docker://ghcr.io/linkerd/dev:v42-rust steps: - if: needs.meta.outputs.publish uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 @@ -80,7 +80,7 @@ jobs: needs: [meta, release] timeout-minutes: 10 runs-on: ubuntu-latest - container: docker://ghcr.io/linkerd/dev:v39-rust + container: docker://ghcr.io/linkerd/dev:v42-rust steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - if: needs.meta.outputs.publish == '' diff --git a/Cargo.toml b/Cargo.toml index bbdbc7f..43f4d9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,11 +3,11 @@ members = [".", "integration"] [package] name = "k8s-gateway-api" -version = "0.13.0" +version = "0.14.0" edition = "2021" license = "Apache-2.0" repository = "https://github.com/linkerd/k8s-gateway-api-rs" -rust-version = "1.60" +rust-version = "1.65" keywords = ["kubernetes", "gateway"] description = "Rust bindings for the Kubenetes Gateway API" diff --git a/README.md b/README.md index b77d750..8dfcd70 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ (Unofficial) Rust bindings for the [Kubernetes Gateway API][site]. -Based on [gateway-api-v0.5.0-rc1]. +Based on [gateway-api-v1.0.0]. [![Crates.io][crate-badge]][crate-url] [![Documentation][docs-badge]][docs-url] @@ -20,7 +20,7 @@ the *v1alpha2* types when the `experimental` feature is enabled. * Express validation constraints * Rustify/Linkify documentation -[gateway-api-v0.5.0-rc1]: https://github.com/kubernetes-sigs/gateway-api/tree/4f86f0bd65173b04dadb558f63fbbd53330736d2 +[gateway-api-v1.0.0]: https://github.com/kubernetes-sigs/gateway-api/tree/a0684982eddeb0360e215e0de322c3210ac49bb9 [site]: https://gateway-api.sigs.k8s.io/ [crate-badge]: https://img.shields.io/crates/v/k8s-gateway-api.svg [crate-url]: https://crates.io/crates/k8s-gateway-api diff --git a/justfile b/justfile index f3b8a70..b3fcce6 100644 --- a/justfile +++ b/justfile @@ -23,7 +23,7 @@ deny: cargo-deny --all-features check docs: - just-cargo doc --frozen --no-deps --features=k8s-openapi/v1_25 + just-cargo doc --frozen --no-deps --features=k8s-openapi/latest test-build *flags: just-cargo test-build --frozen {{ flags }} @@ -32,7 +32,7 @@ test *flags: just-cargo test --frozen {{ flags }} publish *flags: - cargo publish --features=k8s-openapi/v1_25 {{ flags }} + cargo publish --features=k8s-openapi/latest {{ flags }} action-lint: just-dev lint-actions diff --git a/src/httproute.rs b/src/httproute.rs index 720b875..973367d 100644 --- a/src/httproute.rs +++ b/src/httproute.rs @@ -609,9 +609,9 @@ pub enum HttpPathModifier { /// /foo/bar | /foo/ | /xyz/ | /xyz/bar /// /foo | /foo | /xyz | /xyz /// /foo/ | /foo | /xyz | /xyz/ - /// /foo/bar | /foo | | /bar - /// /foo/ | /foo | | / - /// /foo | /foo | | / + /// /foo/bar | /foo | _empty string_ | /bar + /// /foo/ | /foo | _empty string_ | / + /// /foo | /foo | _empty string_ | / /// /foo/ | /foo | / | / /// /foo | /foo | / | / #[serde(rename_all = "camelCase")]