Skip to content

Commit 14197b3

Browse files
authored
Bump OPTE to 0.37.402 (#8766)
* oxidecomputer/opte#805 Pulls in dendrite changes necessary to forward intra-VPC TCP traffic tagged with the new Geneve option.
1 parent fb4c1f7 commit 14197b3

File tree

7 files changed

+21
-20
lines changed

7 files changed

+21
-20
lines changed

Cargo.lock

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ omicron-workspace-hack = "0.1.0"
580580
omicron-zone-package = "0.12.2"
581581
oxide-client = { path = "clients/oxide-client" }
582582
oxide-tokio-rt = "0.1.2"
583-
oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "2d095de2258aa0653d669b72c741f26e608c81a6", features = [ "api", "std" ] }
583+
oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "6a5d3f336685a2aeb291962ae7f583b9355f3022", features = [ "api", "std" ] }
584584
oxlog = { path = "dev-tools/oxlog" }
585585
oxnet = "0.1.3"
586586
once_cell = "1.21.3"
@@ -590,7 +590,7 @@ openapiv3 = "2.2.0"
590590
# must match samael's crate!
591591
openssl = "0.10"
592592
openssl-sys = "0.9"
593-
opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "2d095de2258aa0653d669b72c741f26e608c81a6" }
593+
opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "6a5d3f336685a2aeb291962ae7f583b9355f3022" }
594594
oso = "0.27"
595595
owo-colors = "4.2.2"
596596
oximeter = { path = "oximeter/oximeter" }

dev-tools/xtask/src/virtual_hardware.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ const ZPOOL: &'static str = "/usr/sbin/zpool";
117117
const ZONEADM: &'static str = "/usr/sbin/zoneadm";
118118

119119
const SIDECAR_LITE_COMMIT: &'static str =
120-
"de6fab7885a6bbc5327accffd2a872a31e2f1cb6";
120+
"9499681efa8cdbffe807e6b40bf9211d0d2c21aa";
121121
const SOFTNPU_COMMIT: &'static str = "3203c51cf4473d30991b522062ac0df2e045c2f2";
122122
const PXA_MAC_DEFAULT: &'static str = "a8:e1:de:01:70:1d";
123123

package-manifest.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -735,8 +735,8 @@ only_for_targets.image = "standard"
735735
# the other `source.*` keys.
736736
source.type = "prebuilt"
737737
source.repo = "dendrite"
738-
source.commit = "c44dd2504f2a623e640d94955376cdb5cadd7ed6"
739-
source.sha256 = "c69e76e8d72e28bf2a19cd33dc4790195c17ea8acdf0cf9335dcaf5c34c99510"
738+
source.commit = "974988d7ef5b736c4afa7b00eb94496c04ee70cd"
739+
source.sha256 = "6a085591a8a4f8130d53c20ae58e516d0a31cc2a8a22924b26f25334b08d756a"
740740
output.type = "zone"
741741
output.intermediate_only = true
742742

@@ -762,8 +762,8 @@ only_for_targets.image = "standard"
762762
# the other `source.*` keys.
763763
source.type = "prebuilt"
764764
source.repo = "dendrite"
765-
source.commit = "c44dd2504f2a623e640d94955376cdb5cadd7ed6"
766-
source.sha256 = "2e06ebbe2e4efdca61fc5c3e488748fd24579ccf266649234ab238e650d684eb"
765+
source.commit = "974988d7ef5b736c4afa7b00eb94496c04ee70cd"
766+
source.sha256 = "f09e581770949b1add5ec7da4cbd1de4b78752b9bbc01030f48799adadc0376d"
767767
output.type = "zone"
768768
output.intermediate_only = true
769769

@@ -782,8 +782,8 @@ only_for_targets.image = "standard"
782782
# the other `source.*` keys.
783783
source.type = "prebuilt"
784784
source.repo = "dendrite"
785-
source.commit = "c44dd2504f2a623e640d94955376cdb5cadd7ed6"
786-
source.sha256 = "6b9c4fd710bfa484663e646e971dd2300ecedc5de74163f24c267a86d69075bf"
785+
source.commit = "974988d7ef5b736c4afa7b00eb94496c04ee70cd"
786+
source.sha256 = "60ee0ccb7af2bb76642ccb8bd2213c149369e14764ad63363ae55289679a7525"
787787
output.type = "zone"
788788
output.intermediate_only = true
789789

tools/dendrite_stub_checksums

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
CIDL_SHA256_ILLUMOS="c69e76e8d72e28bf2a19cd33dc4790195c17ea8acdf0cf9335dcaf5c34c99510"
2-
CIDL_SHA256_LINUX_DPD="bcc21ac32125b6016b153e40cefd337eb96d5fec85821f124c5ba53b59fe62e9"
3-
CIDL_SHA256_LINUX_SWADM="c28d2e7f5d73cca8585ecac105ecce2c2c9fd5d3424d9e573b85e7226675e9a8"
1+
CIDL_SHA256_ILLUMOS="6a085591a8a4f8130d53c20ae58e516d0a31cc2a8a22924b26f25334b08d756a"
2+
CIDL_SHA256_LINUX_DPD="66d062a8b000bb718b45051de31b7f05b2ee9f8edca9a9752fc8ce6c516d428b"
3+
CIDL_SHA256_LINUX_SWADM="52681cafeaa1a0e776c2dc3a0747c0f12870b35a7d9b670fe37a31139ae246f9"

tools/dendrite_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
COMMIT="c44dd2504f2a623e640d94955376cdb5cadd7ed6"
1+
COMMIT="974988d7ef5b736c4afa7b00eb94496c04ee70cd"

tools/opte_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.37.396
1+
0.37.402

0 commit comments

Comments
 (0)