Skip to content
Open
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
12 changes: 12 additions & 0 deletions crates/stackable-operator/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

### Changed

- BREAKING: `PodSecurityContextBuilder::new` was removed in favor of `PodSecurityContextBuilder::with_stackable_defaults`
(same for `SecurityContextBuilder`) ([#1205]).
This function already sets up some defaults we want to use across the platform.
Currently this is `runAsNonRoot: true` for `PodSecurityContextBuilder`, which might cause product Pods to crash and require changes.
- BREAKING: `PodSecurityContextBuilder::run_as_non_root` now takes a `bool` instead of assuming consumers always want to set it to `true` ([#1205]).
This is needed to allow users setting it to `false` in case the new `with_stackable_defaults` function sets it to `true`.
- BREAKING: `SecurityContextBuilder::run_as_root` has been removed ([#1205]).

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

## [0.114.0] - 2026-07-22

### Added
Expand Down
60 changes: 43 additions & 17 deletions crates/stackable-operator/src/builder/pod/security.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,25 @@ use k8s_openapi::api::core::v1::{
};

/// A builder for [`SecurityContext`] objects (not to be confused with `PodSecurityContext`).
#[derive(Clone, Default)]
#[derive(Clone)]
pub struct SecurityContextBuilder {
security_context: SecurityContext,
}

impl SecurityContextBuilder {
/// Convenience function for a wide use-case.
pub fn run_as_root() -> SecurityContext {
SecurityContext {
run_as_user: Some(0),
..SecurityContext::default()
/// Construct a new [`SecurityContextBuilder`] that is pre-filled with Stackable's defaults.
///
/// We currently don't have any defaults we set.
///
/// We intentionally don't set `runAsNonRoot`, as we set that in
/// [`PodSecurityContextBuilder::with_stackable_defaults`] already and don't want to confuse
/// users by setting it on the Pod and container.
pub fn with_stackable_defaults() -> Self {
Comment thread
siegfriedweber marked this conversation as resolved.
Self {
security_context: SecurityContext::default(),
}
}

pub fn new() -> Self {
Self::default()
}

pub fn allow_privilege_escalation(&mut self, value: bool) -> &mut Self {
self.security_context.allow_privilege_escalation = Some(value);
self
Expand Down Expand Up @@ -144,14 +145,39 @@ impl SecurityContextBuilder {
}
}

#[derive(Clone, Default)]
/// A builder to construct a [`PodSecurityContext`].
///
/// # Basic usage
///
/// ```
/// use stackable_operator::builder::pod::security::PodSecurityContextBuilder;
///
/// let _ = PodSecurityContextBuilder::with_stackable_defaults()
/// // Configure any arbitrary fields
/// .run_as_user(1234)
/// .build();
/// ```
#[derive(Clone, Debug)]
pub struct PodSecurityContextBuilder {
pod_security_context: PodSecurityContext,
}

impl PodSecurityContextBuilder {
Comment thread
siegfriedweber marked this conversation as resolved.
pub fn new() -> Self {
Self::default()
/// Construct a new [`PodSecurityContextBuilder`] that is pre-filled with Stackable's defaults.
///
/// Currently the defaults are:
///
/// * `runAsNonRoot: true`
pub fn with_stackable_defaults() -> Self {
Comment thread
siegfriedweber marked this conversation as resolved.
// We are using the builder functions to ensure that builder functions exist to override these settings.
let mut builder = Self {
pod_security_context: PodSecurityContext::default(),
};

// Reason: Running as root is bad
builder.run_as_non_root(true);

builder
}

pub fn build(&self) -> PodSecurityContext {
Expand All @@ -173,8 +199,8 @@ impl PodSecurityContextBuilder {
self
}

pub fn run_as_non_root(&mut self) -> &mut Self {
self.pod_security_context.run_as_non_root = Some(true);
pub fn run_as_non_root(&mut self, non_root: bool) -> &mut Self {
self.pod_security_context.run_as_non_root = Some(non_root);
self
}

Expand Down Expand Up @@ -381,13 +407,13 @@ mod tests {

#[test]
fn security_context_builder() {
let mut builder = PodSecurityContextBuilder::new();
let mut builder = PodSecurityContextBuilder::with_stackable_defaults();
let context = builder
.fs_group(1000)
.fs_group_change_policy("policy")
.run_as_user(1001)
.run_as_group(1001)
.run_as_non_root()
.run_as_non_root(true)
.supplemental_groups(&[1002, 1003])
.se_linux_level("level")
.se_linux_role("role")
Expand Down