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
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ on:

env:
OPERATOR_NAME: "hive-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
Expand Down Expand Up @@ -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-hive-operator") | .version')

if [ "$GITHUB_EVENT_NAME" == 'pull_request' ]; then
# Include a PR suffix if this workflow is triggered by a PR
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr_pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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$
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"rust-analyzer.rustfmt.overrideCommand": [
"rustfmt",
"+nightly-2025-10-23",
"+nightly-2026-02-24",
"--edition",
"2024",
"--"
Expand Down
13 changes: 9 additions & 4 deletions Cargo.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -74,7 +74,7 @@ LABEL org.opencontainers.image.description="Deploy and manage Apache Hive cluste

# 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,hive"
LABEL io.openshift.tags="ubi10,stackable,sdp,hive"
LABEL io.k8s.description="Deploy and manage Apache Hive clusters."
LABEL io.k8s.display-name="Stackable Operator for Apache Hive"

Expand Down
12 changes: 6 additions & 6 deletions nix/sources.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -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"
Loading