Skip to content

Commit

Permalink
Merge branch 'main' into issue/2824/better-error-for-invalid-certificate
Browse files Browse the repository at this point in the history
  • Loading branch information
meowjesty authored Oct 17, 2024
2 parents 80924b5 + 133f536 commit 1c9216b
Show file tree
Hide file tree
Showing 22 changed files with 177 additions and 126 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ jobs:
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
# the setup rust toolchain action ignores the input if file exists.. so remove it
- run: rm rust-toolchain.toml
- run: rustup default nightly-2024-10-11
- name: test
run: cargo test --target x86_64-unknown-linux-gnu -p mirrord-agent

Expand Down Expand Up @@ -387,7 +390,7 @@ jobs:
with:
components: rustfmt, clippy
target: aarch64-apple-darwin
toolchain: nightly-2024-10-11
toolchain: nightly-2024-09-12
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
Expand Down Expand Up @@ -559,7 +562,7 @@ jobs:
# building concurrently can run faster the release ide tests
build_mirrord_on_release_branch:
runs-on: ubuntu-24.04
name: build mirrord
name: build mirrord CLI
needs: check_if_release_branch
if: ${{ needs.check_if_release_branch.outputs.release_branch == 'true' }}
steps:
Expand All @@ -568,8 +571,8 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo build --manifest-path=./Cargo.toml
- name: upload layer
- run: cargo build --manifest-path=./Cargo.toml -p mirrord
- name: upload mirrord CLI
uses: actions/upload-artifact@v4
with:
name: mirrord-artifacts
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
target: x86_64-apple-darwin,aarch64-apple-darwin
toolchain: nightly-2024-10-11
toolchain: nightly-2024-09-12
rustflags: ""
- name: Import Code-Signing Certificates
uses: Apple-Actions/import-codesign-certs@v3
Expand All @@ -73,7 +73,7 @@ jobs:
brew tap mitchellh/gon
brew install mitchellh/gon/gon
- name: build mirrord-layer x86-64
run: cargo +nightly-2024-10-11 build --release -p mirrord-layer --target=x86_64-apple-darwin
run: cargo +nightly-2024-09-12 build --release -p mirrord-layer --target=x86_64-apple-darwin
- name: build mirrord-layer macOS arm/arm64e
# Editing the arm64 binary, since arm64e can be loaded into both arm64 & arm64e
# >> target/debug/libmirrord_layer.dylib: Mach-O 64-bit dynamically linked shared library arm64
Expand All @@ -82,7 +82,7 @@ jobs:
# >> magic bits: 0000000 facf feed 000c 0100 0002 0000 0006 0000
# >> target/debug/libmirrord_layer.dylib: Mach-O 64-bit dynamically linked shared library arm64e
run: |
cargo +nightly-2024-10-11 build --release -p mirrord-layer --target=aarch64-apple-darwin
cargo +nightly-2024-09-12 build --release -p mirrord-layer --target=aarch64-apple-darwin
cp target/aarch64-apple-darwin/release/libmirrord_layer.dylib target/aarch64-apple-darwin/release/libmirrord_layer_arm64e.dylib
printf '\x02' | dd of=target/aarch64-apple-darwin/release/libmirrord_layer_arm64e.dylib bs=1 seek=8 count=1 conv=notrunc
- name: Sign layer binaries
Expand All @@ -102,11 +102,11 @@ jobs:
- name: build macOS arm cli with universal dylib
env:
MIRRORD_LAYER_FILE: /tmp/target/universal-apple-darwin/release/libmirrord_layer.dylib
run: cargo +nightly-2024-10-11 build --release -p mirrord --target=aarch64-apple-darwin
run: cargo +nightly-2024-09-12 build --release -p mirrord --target=aarch64-apple-darwin
- name: build macOS x86-64 cli with universal dylib
env:
MIRRORD_LAYER_FILE: /tmp/target/universal-apple-darwin/release/libmirrord_layer.dylib
run: cargo +nightly-2024-10-11 build --release -p mirrord --target=x86_64-apple-darwin
run: cargo +nightly-2024-09-12 build --release -p mirrord --target=x86_64-apple-darwin
- name: Sign cli binaries
env:
AC_USERNAME: ${{ secrets.APPLE_DEVELOPER }}
Expand Down
37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,43 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang

<!-- towncrier release notes start -->

## [3.121.0](https://github.com/metalbear-co/mirrord/tree/3.121.0) - 2024-10-17


### Added

- Added support for Istio CNI
[#2851](https://github.com/metalbear-co/mirrord/issues/2851)
- Added `nodeSelector` option to agent config.


### Changed

- Allowed filtered steal requests to be retried when we get a Reset from
hyper(h2).


### Fixed

- Fixed an issue where `mirrord exec ... -- npm run serve` in a Vue project was
failing with `EAFNOSUPPORT: address family not supported ::1:80`. Added new
`.experimental.hide_ipv6_interfaces` configuration entry that allows for
hiding local IPv6 interface addresses from the user application.
[#2807](https://github.com/metalbear-co/mirrord/issues/2807)
- Fixed wrong warning being displayed when binding UDP port 0 and filtering HTTP.
[#2812](https://github.com/metalbear-co/mirrord/issues/2812)
- mirrord now respects `insecure-skip-tls-verify` option set in the kubeconfig
when `accept_invalid_certificates` is not provided in the mirrord config.
[#2825](https://github.com/metalbear-co/mirrord/issues/2825)


### Internal

- Downgraded Rust toochain to nightly-2024-09-12.
[#downgrade-rust](https://github.com/metalbear-co/mirrord/issues/downgrade-rust)
- Added integration (regression) test for binding port 0 twice.
[#2812](https://github.com/metalbear-co/mirrord/issues/2812)

## [3.120.1](https://github.com/metalbear-co/mirrord/tree/3.120.1) - 2024-10-14


Expand Down
58 changes: 29 additions & 29 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ resolver = "2"

# latest commits on rustls suppress certificate verification
[workspace.package]
version = "3.120.1"
version = "3.121.0"
edition = "2021"
license = "MIT"
readme = "README.md"
Expand Down
1 change: 0 additions & 1 deletion changelog.d/+649-gogrpc-retry-fix.changed.md

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/+nodeselector.added.md

This file was deleted.

1 change: 0 additions & 1 deletion changelog.d/+update-rust.changed.md

This file was deleted.

Loading

0 comments on commit 1c9216b

Please sign in to comment.