Skip to content
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: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ All notable changes to RustFS Operator are documented in this file. The format i

### Fixed

- Use `docker.io/rustfs/operator` as the default Helm image repository for the Operator,
Console, and COSI driver, while preserving repository overrides through Helm values.
- Reject multi-pool Tenants containing a single-node single-disk pool before applying pool workloads, matching RustFS startup constraints.
- Reject additional volume mounts that overlap operator-managed data, logging, TLS, or OIDC paths.

Expand Down
2 changes: 1 addition & 1 deletion deploy/rustfs-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ helm upgrade --install rustfs-operator deploy/rustfs-operator/ \
| Parameter | Description | Default |
|-----------|-------------|---------|
| `operator.replicas` | Number of operator replicas | `1` |
| `operator.image.repository` | Operator image repository | `rustfs/operator` |
| `operator.image.repository` | Operator image repository | `docker.io/rustfs/operator` |
| `operator.image.tag` | Operator image tag; empty uses `Chart.appVersion` | `""` |
| `operator.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `operator.imagePullSecrets` | Image pull secrets | `[]` |
Expand Down
6 changes: 3 additions & 3 deletions deploy/rustfs-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ operator:
leaderElect:

image:
repository: rustfs/operator
repository: docker.io/rustfs/operator

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Update the documented operator image default

When users consult the bundled chart README to audit or configure this new default, deploy/rustfs-operator/README.md:124 still lists rustfs/operator. The table was accurate before this line changed, but now it contradicts the rendered chart and still presents the short name this fix is intended to remove, giving restricted-registry users the wrong documented default.

Useful? React with 👍 / 👎.

# Defaults to Chart.appVersion so a released chart never selects a mutable image tag.
tag: ""
pullPolicy: IfNotPresent
Expand Down Expand Up @@ -224,7 +224,7 @@ console:

image:
# Console uses the same image as operator
repository: rustfs/operator
repository: docker.io/rustfs/operator
tag: "" # Defaults to operator.image.tag
pullPolicy: IfNotPresent

Expand Down Expand Up @@ -364,7 +364,7 @@ cosiDriver:

image:
# The COSI driver binary ships in the same image as operator.
repository: rustfs/operator
repository: docker.io/rustfs/operator
tag: "" # Defaults to operator.image.tag
pullPolicy: IfNotPresent

Expand Down
6 changes: 5 additions & 1 deletion e2e/tests/sts_manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,11 @@ fn helm_template(args: &[&str]) -> Option<Output> {

fn helm_template_chart(chart: &Path, args: &[&str]) -> Output {
let mut command = Command::new("helm");
command.arg("template").arg("rustfs-operator").arg(chart);
command
.arg("template")
.arg("rustfs-operator")
.arg(chart)
.args(["--namespace", "default"]);
command.args(args);
command.output().expect("helm template command runs")
}
Expand Down
6 changes: 3 additions & 3 deletions src/types/v1alpha1/tenant/workloads.rs
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ impl Tenant {
};
let validate_seccomp = |field_path: &str, type_: &str, localhost_profile: Option<&str>| {
validate_declared_seccomp_profile(field_path, type_, localhost_profile)
.map_err(&invalid_profile)
.map_err(invalid_profile)
};
let validate_app_armor =
|field_path: &str, type_: &str, localhost_profile: Option<&str>| {
Expand All @@ -894,7 +894,7 @@ impl Tenant {
"spec.containerSecurityContext",
self.spec.container_security_context.as_ref(),
)
.map_err(&invalid_profile)?;
.map_err(invalid_profile)?;

if let Some(profile) = self
.spec
Expand Down Expand Up @@ -933,7 +933,7 @@ impl Tenant {
&format!("spec.pools[name={}].containerSecurityContext", pool.name),
pool.container_security_context.as_ref(),
)
.map_err(&invalid_profile)?;
.map_err(invalid_profile)?;

if let Some(profile) = pool
.security_context
Expand Down