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

Release 0.46.0 and bump Rust version #633

Merged
merged 6 commits into from
Aug 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: '0'
CARGO_PROFILE_DEV_DEBUG: '0'
RUST_TOOLCHAIN_VERSION: "1.68.2"
RUST_TOOLCHAIN_VERSION: "1.71.0"
RUSTFLAGS: "-D warnings"
RUSTDOCFLAGS: "-D warnings"
RUST_LOG: "info"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

## [0.46.0] - 2023-08-08

### Changed

- Bump all dependencies (including kube and k8s-openapi) ([#632]).
- Bump Rust version to 0.71.0 ([#633]).
- Refactor Cargo.toml's to share workspace configuration, such as version and license ([#633]).

[#632]: https://github.com/stackabletech/operator-rs/pull/632
[#633]: https://github.com/stackabletech/operator-rs/pull/633

## [0.45.1] - 2023-08-01

Expand Down
17 changes: 12 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
[package]
[workspace.package]
version = "0.46.0"
authors = ["Stackable GmbH <[email protected]>"]
description = "Stackable Operator Framework"
edition = "2021"
license = "Apache-2.0"
name = "stackable-operator"
version = "0.45.1"
edition = "2021"
repository = "https://github.com/stackabletech/operator-rs"

[package]
name = "stackable-operator"
description = "Stackable Operator Framework"
version.workspace = true
authors.workspace = true
license.workspace = true
edition.workspace = true
repository.workspace = true

[dependencies]
chrono = { version = "0.4.26", default-features = false }
clap = { version = "4.3.19", features = ["derive", "cargo", "env"] }
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.68.2"
channel = "1.71.0"
2 changes: 1 addition & 1 deletion src/builder/pod/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ impl PodBuilder {
}

pub fn phase(&mut self, phase: &str) -> &mut Self {
let mut status = self.status.get_or_insert_with(PodStatus::default);
let status = self.status.get_or_insert_with(PodStatus::default);
status.phase = Some(phase.to_string());
self
}
Expand Down
18 changes: 9 additions & 9 deletions src/builder/pod/security.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ impl SecurityContextBuilder {
}

pub fn se_linux_level(&mut self, level: impl Into<String>) -> &mut Self {
let mut sc = self
let sc = self
.security_context
.se_linux_options
.get_or_insert_with(SELinuxOptions::default);
sc.level = Some(level.into());
self
}
pub fn se_linux_role(&mut self, role: impl Into<String>) -> &mut Self {
let mut sc = self
let sc = self
.security_context
.se_linux_options
.get_or_insert_with(SELinuxOptions::default);
Expand All @@ -80,7 +80,7 @@ impl SecurityContextBuilder {
}

pub fn se_linux_type(&mut self, type_: impl Into<String>) -> &mut Self {
let mut sc = self
let sc = self
.security_context
.se_linux_options
.get_or_insert_with(SELinuxOptions::default);
Expand All @@ -89,7 +89,7 @@ impl SecurityContextBuilder {
}

pub fn se_linux_user(&mut self, user: impl Into<String>) -> &mut Self {
let mut sc = self
let sc = self
.security_context
.se_linux_options
.get_or_insert_with(SELinuxOptions::default);
Expand All @@ -98,7 +98,7 @@ impl SecurityContextBuilder {
}

pub fn seccomp_profile_localhost(&mut self, profile: impl Into<String>) -> &mut Self {
let mut sc = self
let sc = self
.security_context
.seccomp_profile
.get_or_insert_with(SeccompProfile::default);
Expand All @@ -107,7 +107,7 @@ impl SecurityContextBuilder {
}

pub fn seccomp_profile_type(&mut self, type_: impl Into<String>) -> &mut Self {
let mut sc = self
let sc = self
.security_context
.seccomp_profile
.get_or_insert_with(SeccompProfile::default);
Expand All @@ -116,7 +116,7 @@ impl SecurityContextBuilder {
}

pub fn win_credential_spec(&mut self, spec: impl Into<String>) -> &mut Self {
let mut wo = self
let wo = self
.security_context
.windows_options
.get_or_insert_with(WindowsSecurityContextOptions::default);
Expand All @@ -125,7 +125,7 @@ impl SecurityContextBuilder {
}

pub fn win_credential_spec_name(&mut self, name: impl Into<String>) -> &mut Self {
let mut wo = self
let wo = self
.security_context
.windows_options
.get_or_insert_with(WindowsSecurityContextOptions::default);
Expand All @@ -134,7 +134,7 @@ impl SecurityContextBuilder {
}

pub fn win_run_as_user_name(&mut self, name: impl Into<String>) -> &mut Self {
let mut wo = self
let wo = self
.security_context
.windows_options
.get_or_insert_with(WindowsSecurityContextOptions::default);
Expand Down
12 changes: 6 additions & 6 deletions stackable-operator-derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
authors = ["Stackable GmbH <[email protected]>"]
description = "Stackable Operator Framework"
edition = "2021"
license = "Apache-2.0"
name = "stackable-operator-derive"
version = "0.45.1"
repository = "https://github.com/stackabletech/operator-rs"
description = "Derive macros for the Stackable Operator Framework"
version.workspace = true
authors.workspace = true
license.workspace = true
edition.workspace = true
repository.workspace = true

[lib]
proc-macro = true
Expand Down
Loading