Skip to content

Commit 991955f

Browse files
chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@dc62e95 (#402)
Reference-to: stackabletech/operator-templating@dc62e95 (UBI10 rollout, new rust toolchain)
1 parent 9284143 commit 991955f

10 files changed

Lines changed: 32 additions & 26 deletions

File tree

.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ on:
2323

2424
env:
2525
OPERATOR_NAME: "commons-operator"
26-
RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2025-10-23"
27-
NIX_PKG_MANAGER_VERSION: "2.30.0"
28-
RUST_TOOLCHAIN_VERSION: "1.89.0"
26+
RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2026-02-24"
27+
NIX_PKG_MANAGER_VERSION: "2.33.3"
28+
RUST_TOOLCHAIN_VERSION: "1.93.0"
2929
HADOLINT_VERSION: "v2.14.0"
3030
PYTHON_VERSION: "3.14"
3131
CARGO_TERM_COLOR: always
@@ -139,7 +139,7 @@ jobs:
139139
set -euo pipefail
140140
[ -n "$GITHUB_DEBUG" ] && set -x
141141
142-
CURRENT_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
142+
CURRENT_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "stackable-commons-operator") | .version')
143143
144144
if [ "$GITHUB_EVENT_NAME" == 'pull_request' ]; then
145145
# Include a PR suffix if this workflow is triggered by a PR

.github/workflows/pr_pre-commit.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77

88
env:
99
CARGO_TERM_COLOR: always
10-
NIX_PKG_MANAGER_VERSION: "2.30.0"
11-
RUST_TOOLCHAIN_VERSION: "nightly-2025-10-23"
10+
NIX_PKG_MANAGER_VERSION: "2.33.3"
11+
RUST_TOOLCHAIN_VERSION: "nightly-2026-02-24"
1212
HADOLINT_VERSION: "v2.14.0"
1313
PYTHON_VERSION: "3.14"
14-
JINJA2_CLI_VERSION: "0.8.2"
14+
JINJA2_CLI_VERSION: "1.0.0"
1515

1616
jobs:
1717
pre-commit:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ repos:
105105
- id: cargo-rustfmt
106106
name: cargo-rustfmt
107107
language: system
108-
entry: cargo +nightly-2025-10-23 fmt --all -- --check
108+
entry: cargo +nightly-2026-02-24 fmt --all -- --check
109109
stages: [pre-commit, pre-merge-commit]
110110
pass_filenames: false
111111
files: \.rs$

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"rust-analyzer.rustfmt.overrideCommand": [
33
"rustfmt",
4-
"+nightly-2025-10-23",
4+
"+nightly-2026-02-24",
55
"--edition",
66
"2024",
77
"--"

Cargo.nix

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

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ compile-chart: version crds config
3232

3333
chart-clean:
3434
rm -rf "deploy/helm/${OPERATOR_NAME}/configs"
35+
rm -rf "deploy/helm/${OPERATOR_NAME}/crds"
3536

3637
version:
3738
cat "deploy/helm/${OPERATOR_NAME}/Chart.yaml" | yq ".version = \"${VERSION}\" | .appVersion = \"${VERSION}\"" > "deploy/helm/${OPERATOR_NAME}/Chart.yaml.new"

docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
# We want to automatically use the latest. We also don't tag our images with a version.
1515
# hadolint ignore=DL3007
16-
FROM oci.stackable.tech/sdp/ubi9-rust-builder:latest AS builder
16+
FROM oci.stackable.tech/sdp/ubi10-rust-builder:latest AS builder
1717

1818

1919
# We want to automatically use the latest.
2020
# hadolint ignore=DL3007
21-
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS operator
21+
FROM registry.access.redhat.com/ubi10/ubi-minimal:latest AS operator
2222

2323
ARG VERSION
2424
# NOTE (@Techassi): This is required for OpenShift/Red Hat certification
@@ -74,7 +74,7 @@ LABEL org.opencontainers.image.description="Deploy and manage Stackable Commons
7474

7575
# https://docs.openshift.com/container-platform/4.16/openshift_images/create-images.html#defining-image-metadata
7676
# https://github.com/projectatomic/ContainerApplicationGenericLabels/blob/master/vendor/redhat/labels.md
77-
LABEL io.openshift.tags="ubi9,stackable,sdp,commons"
77+
LABEL io.openshift.tags="ubi10,stackable,sdp,commons"
7878
LABEL io.k8s.description="Deploy and manage Stackable Commons clusters."
7979
LABEL io.k8s.display-name="Stackable Operator for Stackable Commons"
8080

nix/sources.json

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

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# DO NOT EDIT, this file is generated by operator-templating
22
[toolchain]
3-
channel = "1.89.0"
3+
channel = "1.93.0"
44
profile = "default"

shell.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ in pkgs.mkShell rec {
2121
];
2222

2323
# derivation runtime dependencies
24-
buildInputs = pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet;
24+
buildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet);
2525

2626
# build time dependencies
27-
nativeBuildInputs = pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet ++ (with pkgs; [
27+
nativeBuildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet ++ (with pkgs; [
2828
beku
2929
docker
3030
gettext # for the proper envsubst
@@ -38,7 +38,7 @@ in pkgs.mkShell rec {
3838
# tilt already defined in default.nix
3939
which
4040
yq-go
41-
]);
41+
]));
4242

4343
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
4444
BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.glibc.dev}/include -I${pkgs.clang}/resource-root/include";

0 commit comments

Comments
 (0)