From 57607318f29aebec9acd3f505ca50331d48a04b2 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Fri, 27 Feb 2026 10:38:28 +0000 Subject: [PATCH] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@dc62e956d3d1f304c43dbd870b3f0ede036cda25 Reference-to: stackabletech/operator-templating@dc62e95 (UBI10 rollout, new rust toolchain) --- .github/workflows/build.yaml | 8 ++++---- .github/workflows/pr_pre-commit.yaml | 6 +++--- .pre-commit-config.yaml | 2 +- .vscode/settings.json | 2 +- Cargo.nix | 13 +++++++++---- docker/Dockerfile | 6 +++--- nix/sources.json | 12 ++++++------ rust-toolchain.toml | 2 +- 8 files changed, 28 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c09d3b6..d8834a8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,9 +23,9 @@ on: env: OPERATOR_NAME: "opensearch-operator" - RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2025-10-23" - NIX_PKG_MANAGER_VERSION: "2.30.0" - RUST_TOOLCHAIN_VERSION: "1.89.0" + RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2026-02-24" + NIX_PKG_MANAGER_VERSION: "2.33.3" + RUST_TOOLCHAIN_VERSION: "1.93.0" HADOLINT_VERSION: "v2.14.0" PYTHON_VERSION: "3.14" CARGO_TERM_COLOR: always @@ -139,7 +139,7 @@ jobs: set -euo pipefail [ -n "$GITHUB_DEBUG" ] && set -x - CURRENT_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') + CURRENT_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "stackable-opensearch-operator") | .version') if [ "$GITHUB_EVENT_NAME" == 'pull_request' ]; then # Include a PR suffix if this workflow is triggered by a PR diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml index acbc963..b45e2da 100644 --- a/.github/workflows/pr_pre-commit.yaml +++ b/.github/workflows/pr_pre-commit.yaml @@ -7,11 +7,11 @@ on: env: CARGO_TERM_COLOR: always - NIX_PKG_MANAGER_VERSION: "2.30.0" - RUST_TOOLCHAIN_VERSION: "nightly-2025-10-23" + NIX_PKG_MANAGER_VERSION: "2.33.3" + RUST_TOOLCHAIN_VERSION: "nightly-2026-02-24" HADOLINT_VERSION: "v2.14.0" PYTHON_VERSION: "3.14" - JINJA2_CLI_VERSION: "0.8.2" + JINJA2_CLI_VERSION: "1.0.0" jobs: pre-commit: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e338a62..91fc091 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -105,7 +105,7 @@ repos: - id: cargo-rustfmt name: cargo-rustfmt language: system - entry: cargo +nightly-2025-10-23 fmt --all -- --check + entry: cargo +nightly-2026-02-24 fmt --all -- --check stages: [pre-commit, pre-merge-commit] pass_filenames: false files: \.rs$ diff --git a/.vscode/settings.json b/.vscode/settings.json index b3b3af8..b59f2a5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ { "rust-analyzer.rustfmt.overrideCommand": [ "rustfmt", - "+nightly-2025-10-23", + "+nightly-2026-02-24", "--edition", "2024", "--" diff --git a/Cargo.nix b/Cargo.nix index c963994..2bb64c9 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -1,5 +1,5 @@ -# This file was @generated by crate2nix 0.14.1 with the command: +# This file was @generated by crate2nix 0.15.0 with the command: # "generate" # See https://github.com/kolloch/crate2nix for more info. @@ -19,6 +19,11 @@ # (separated by `,`, prefixed with `+`). # Used for conditional compilation based on CPU feature detection. , targetFeatures ? [] + # Additional target attributes for conditional dependencies. + # Use this for custom cfg flags that are passed via rustcflags but need to + # be known at Nix evaluation time for dependency resolution. + # Example: { tracing_unstable = true; } for crates using cfg(tracing_unstable). +, extraTargetFlags ? {} # Whether to perform release builds: longer compile times, faster binaries. , release ? true # Additional crate2nix configuration if it exists. @@ -15195,7 +15200,7 @@ rec { endian = if platform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"; pointer_width = toString platform.parsed.cpu.bits; debug_assertions = false; - }; + } // extraTargetFlags; registryUrl = { registries @@ -15358,7 +15363,7 @@ rec { in pkgs.runCommand "${crate.name}-linked" { - inherit (crate) outputs crateName; + inherit (crate) outputs crateName meta; passthru = (crate.passthru or { }) // { inherit test; }; @@ -15570,7 +15575,7 @@ rec { crateConfig // { src = - crateConfig.src or (pkgs.fetchurl rec { + crateConfig.src or (fetchurl rec { name = "${crateConfig.crateName}-${crateConfig.version}.tar.gz"; # https://www.pietroalbini.org/blog/downloading-crates-io/ # Not rate-limited, CDN URL. diff --git a/docker/Dockerfile b/docker/Dockerfile index 477a9d7..00a515c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,12 +13,12 @@ # We want to automatically use the latest. We also don't tag our images with a version. # hadolint ignore=DL3007 -FROM oci.stackable.tech/sdp/ubi9-rust-builder:latest AS builder +FROM oci.stackable.tech/sdp/ubi10-rust-builder:latest AS builder # We want to automatically use the latest. # hadolint ignore=DL3007 -FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS operator +FROM registry.access.redhat.com/ubi10/ubi-minimal:latest AS operator ARG VERSION # NOTE (@Techassi): This is required for OpenShift/Red Hat certification @@ -74,7 +74,7 @@ LABEL org.opencontainers.image.description="Deploy and manage OpenSearch cluster # https://docs.openshift.com/container-platform/4.16/openshift_images/create-images.html#defining-image-metadata # https://github.com/projectatomic/ContainerApplicationGenericLabels/blob/master/vendor/redhat/labels.md -LABEL io.openshift.tags="ubi9,stackable,sdp,opensearch" +LABEL io.openshift.tags="ubi10,stackable,sdp,opensearch" LABEL io.k8s.description="Deploy and manage OpenSearch clusters." LABEL io.k8s.display-name="Stackable Operator for OpenSearch" diff --git a/nix/sources.json b/nix/sources.json index f79c2cf..10cce14 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "kolloch", "repo": "crate2nix", - "rev": "be31feae9a82c225c0fd1bdf978565dc452a483a", - "sha256": "14d0ymlrwk7dynv35qcw4xn0dylfpwjmf6f8znflbk2l6fk23l12", + "rev": "26b698e804dd32dc5bb1995028fef00cc87d603a", + "sha256": "13jgy25yjd1m42xam6zri8vwx0n2qbwvpad2cmkhkrlx913n79ni", "type": "tarball", - "url": "https://github.com/kolloch/crate2nix/archive/be31feae9a82c225c0fd1bdf978565dc452a483a.tar.gz", + "url": "https://github.com/kolloch/crate2nix/archive/26b698e804dd32dc5bb1995028fef00cc87d603a.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", - "sha256": "0h3gvjbrlkvxhbxpy01n603ixv0pjy19n9kf73rdkchdvqcn70j2", + "rev": "26eaeac4e409d7b5a6bf6f90a2a2dc223c78d915", + "sha256": "1knl8dcr5ip70a2vbky3q844212crwrvybyw2nhfmgm1mvqry963", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a7fc11be66bdfb5cdde611ee5ce381c183da8386.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/26eaeac4e409d7b5a6bf6f90a2a2dc223c78d915.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d8582fd..eecd346 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ # DO NOT EDIT, this file is generated by operator-templating [toolchain] -channel = "1.89.0" +channel = "1.93.0" profile = "default"