Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rust to 1.68.1 and tarpaulin to 0.25.1 #574

Merged
merged 12 commits into from
Apr 12, 2023
2 changes: 1 addition & 1 deletion .github/actions/build-component-per-arch/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ async function shell_cmd(cmd) {

if (core.getInput('build_rust') == '1') {
console.log(`Install Rust`)
child_process.execSync(`curl https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.63.0`);
child_process.execSync(`curl https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.68.1`);
const bindir = `${process.env.HOME}/.cargo/bin`;
process.env.PATH = `${process.env.PATH}:${bindir}`;

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-rust-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
- name: Rust install
uses: actions-rs/toolchain@v1
with:
toolchain: 1.63.0
toolchain: 1.68.1
override: true
components: clippy, rustfmt

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Rust install
uses: actions-rs/toolchain@v1
with:
toolchain: 1.63.0
toolchain: 1.68.1
override: true
components: clippy, rustfmt
- name: Install Linux requirements
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-tarpaulin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:

env:
CARGO_TERM_COLOR: always
CARGO_VERSION: 1.63.0
CARGO_VERSION: 1.68.1

jobs:
build:
Expand All @@ -37,7 +37,7 @@ jobs:
persist-credentials: false

- name: Create tarpaulin instance
run: docker create --network host --security-opt seccomp=unconfined -v "${PWD}:/volume" xd009642/tarpaulin:0.20.1 bash -c "echo 'sleep 600m; echo bye' > /tmp/keep_alive.sh; chmod 777 /tmp/keep_alive.sh; /tmp/keep_alive.sh" > container_id.txt
run: docker create --network host --security-opt seccomp=unconfined -v "${PWD}:/volume" xd009642/tarpaulin:0.25.1 bash -c "echo 'sleep 600m; echo bye' > /tmp/keep_alive.sh; chmod 777 /tmp/keep_alive.sh; /tmp/keep_alive.sh" > container_id.txt
- name: Start tarpaulin instance
run: docker start $(cat container_id.txt)
- name: Install linux requirement in tarpaulin instance
Expand Down
28 changes: 14 additions & 14 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 README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<p align="center"><img src="https://github.com/project-akri/akri-docs/blob/main/art/logo-horizontal/akri-logo-horizontal-light.svg" alt="Akri Logo" width="300"></p>

[![Slack channel #akri](https://img.shields.io/badge/slack-akri-blueviolet.svg?logo=slack)](https://kubernetes.slack.com/messages/akri)
[![Rust Version](https://img.shields.io/badge/rustc-1.63.0-blue.svg)](https://blog.rust-lang.org/2022/08/11/Rust-1.63.0.html)
[![Rust Version](https://img.shields.io/badge/rustc-1.68.1-blue.svg)](https://blog.rust-lang.org/2023/03/31/Rust-1.68.1.html)
[![Kubernetes Version](https://img.shields.io/badge/kubernetes-≥%201.16-blue.svg)](https://kubernetes.io/)
[![codecov](https://codecov.io/gh/project-akri/akri/branch/main/graph/badge.svg?token=V468HO7CDE)](https://codecov.io/gh/project-akri/akri)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5339/badge)](https://bestpractices.coreinfrastructure.org/projects/5339)
Expand Down
4 changes: 2 additions & 2 deletions agent/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "agent"
version = "0.10.1"
version = "0.10.2"
authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.68.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
10 changes: 5 additions & 5 deletions agent/src/util/device_plugin_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -366,13 +366,13 @@ impl DevicePluginService {
/// # More details
/// Cases based on the usage slot (`device_usage_id`) value
/// 1. device_usage\[id\] == "" ... this means that the device is available for use
/// * <ACTION> return true
/// * (ACTION) return true
/// 2. device_usage\[id\] == self.nodeName ... this means THIS node previously used id, but the DevicePluginManager knows that this is no longer true
/// * <ACTION> return false
/// 3. device_usage\[id\] == <some other node> ... this means that we believe this device is in use by another node and should be marked unhealthy
/// * <ACTION> return error
/// * (ACTION) return false
/// 3. device_usage\[id\] == (some other node) ... this means that we believe this device is in use by another node and should be marked unhealthy
/// * (ACTION) return error
/// 4. No corresponding id found ... this is an unknown error condition (BAD)
/// * <ACTION> return error
/// * (ACTION) return error
fn slot_available_to_reserve(
device_usage_id: &str,
node_name: &str,
Expand Down
2 changes: 1 addition & 1 deletion agent/src/util/registration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ pub async fn internal_run_registration_server(
socket_path
);
// Delete socket in case previously created/used
std::fs::remove_file(&socket_path).unwrap_or(());
std::fs::remove_file(socket_path).unwrap_or(());
let incoming = {
let uds =
tokio::net::UnixListener::bind(socket_path).expect("Failed to bind to socket path");
Expand Down
2 changes: 1 addition & 1 deletion agent/src/util/slot_reconciliation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ impl SlotQuery for CriCtlSlotQuery {
/// Calls crictl to query container runtime in search of active containers and extracts their usage slots.
async fn get_node_slots(&self) -> SlotQueryResult {
match Command::new(&self.crictl_path)
.args(&[
.args([
"--runtime-endpoint",
&self.runtime_endpoint,
"--image-endpoint",
Expand Down
4 changes: 2 additions & 2 deletions build/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ then
if [ -x "$(command -v sudo)" ];
then
echo "Install rustup"
sudo curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=1.63.0
sudo curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=1.68.1
else
echo "Install rustup"
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=1.63.0
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=1.68.1
fi
else
echo "Found rustup"
Expand Down
4 changes: 2 additions & 2 deletions controller/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "controller"
version = "0.10.1"
version = "0.10.2"
authors = ["<bfjelds@microsoft.com>", "<kagold@microsoft.com>"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.68.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
10 changes: 5 additions & 5 deletions controller/src/util/pod_action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ pub struct PodActionInfo {
impl PodActionInfo {
/// This will determine what action to take on the broker Pod
///
/// | --> <Unknown> ===> PodAction::Remove
/// | --> <Known>
/// | --> (Unknown) ===> PodAction::Remove
/// | --> (Known)
/// | --> <Phase == Running>
/// | --> <InstanceAction == Remove> ===> PodAction::Remove
/// | --> <InstanceAction != Remove> ===> PodAction::NoAction
Expand All @@ -51,9 +51,9 @@ impl PodActionInfo {
/// | --> <InstanceAction == Remove> ===> PodAction::Remove
/// | --> <InstanceAction != Remove> ===> PodAction::NoAction
/// | --> <Phase == NonRunning>
/// | --> <No PodStartTime> ===> PodAction::NoAction
/// | --> <PodStartTime within grace period> ===> PodAction::NoAction
/// | --> <PodStartTime outside grace period> ===> PodAction::RemoveAndAdd
/// | --> (No PodStartTime) ===> PodAction::NoAction
/// | --> (PodStartTime within grace period) ===> PodAction::NoAction
/// | --> (PodStartTime outside grace period) ===> PodAction::RemoveAndAdd
///
pub fn select_pod_action(&self) -> anyhow::Result<PodAction> {
log::trace!(
Expand Down
4 changes: 2 additions & 2 deletions deployment/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.10.1
version: 0.10.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 0.10.1
appVersion: 0.10.2
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "debug-echo-discovery-handler"
version = "0.10.1"
version = "0.10.2"
authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.68.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions discovery-handler-modules/onvif-discovery-handler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "onvif-discovery-handler"
version = "0.10.1"
version = "0.10.2"
authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.68.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions discovery-handler-modules/opcua-discovery-handler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "opcua-discovery-handler"
version = "0.10.1"
version = "0.10.2"
authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.68.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions discovery-handler-modules/udev-discovery-handler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "udev-discovery-handler"
version = "0.10.1"
version = "0.10.2"
authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.68.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions discovery-handlers/debug-echo/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "akri-debug-echo"
version = "0.10.1"
version = "0.10.2"
authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.68.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions discovery-handlers/onvif/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "akri-onvif"
version = "0.10.1"
version = "0.10.2"
authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.68.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions discovery-handlers/opcua/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "akri-opcua"
version = "0.10.1"
version = "0.10.2"
authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.68.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions discovery-handlers/udev/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "akri-udev"
version = "0.10.1"
version = "0.10.2"
authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
edition = "2018"
rust-version = "1.63.0"
rust-version = "1.68.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
Loading