Merge branch 'main' into renovate/migrate-config

lfrancke · web-flow · commit 3a5ebbe07611 · 2025-05-31T21:34:34.000+02:00
diff --git a/.github/ISSUE_TEMPLATE/pre-release.md b/.github/ISSUE_TEMPLATE/pre-release.md
@@ -66,15 +66,14 @@ Part of <https://github.com/stackabletech/issues/TRACKING_ISSUE>
 - [ ] _PR for airflow-operator_
 - [ ] _PR for commons-operator_
 - [ ] _PR for druid-operator_
-- [ ] _PR for edc-operator_
 - [ ] _PR for hbase-operator_
 - [ ] _PR for hdfs-operator_
-- [ ] _PR for hello-world-operator_
 - [ ] _PR for hive-operator_
 - [ ] _PR for kafka-operator_
 - [ ] _PR for listener-operator_
 - [ ] _PR for nifi-operator_
 - [ ] _PR for opa-operator_
+- [ ] _PR for opensearch-operator_
 - [ ] _PR for secret-operator_
 - [ ] _PR for spark-k8s-operator_
 - [ ] _PR for superset-operator_
diff --git a/.github/workflows/generate_prs.yml b/.github/workflows/generate_prs.yml
@@ -52,10 +52,6 @@ jobs:
             pretty_string: Apache HDFS
             product_string: hdfs
             url: stackabletech/hdfs-operator.git
-          - name: hello-world-operator
-            pretty_string: Hello World
-            product_string: hello
-            url: stackabletech/hello-world-operator.git
           - name: hive-operator
             pretty_string: Apache Hive
             product_string: hive
@@ -81,6 +77,10 @@ jobs:
             pretty_string: OpenPolicyAgent
             product_string: opa
             url: stackabletech/opa-operator.git
+          - name: opensearch-operator
+            pretty_string: OpenSearch
+            product_string: opensearch
+            url: stackabletech/opensearch-operator.git
           - name: secret-operator
             include_productconfig: false
             has_product: false
diff --git a/.github/workflows/pr_pre-commit.yml b/.github/workflows/pr_pre-commit.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
-      - uses: stackabletech/actions/run-pre-commit@4bfd3b65f22af597fe784599c077dc34bf5894a7 # v0.8.0
+      - uses: stackabletech/actions/run-pre-commit@9aae2d1c14239021bfa33c041010f6fb7adec815 # v0.8.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           hadolint: ${{ env.HADOLINT_VERSION }}
diff --git a/config/repositories.yaml b/config/repositories.yaml
@@ -26,10 +26,6 @@ repositories:
     pretty_string: Apache HDFS
     product_string: hdfs
     url: stackabletech/hdfs-operator.git
-  - name: hello-world-operator
-    pretty_string: Hello World
-    product_string: hello
-    url: stackabletech/hello-world-operator.git
   - name: hive-operator
     pretty_string: Apache Hive
     product_string: hive
@@ -55,6 +51,10 @@ repositories:
     pretty_string: OpenPolicyAgent
     product_string: opa
     url: stackabletech/opa-operator.git
+  - name: opensearch-operator
+    pretty_string: OpenSearch
+    product_string: opensearch
+    url: stackabletech/opensearch-operator.git
   - name: secret-operator
     include_productconfig: false
     has_product: false
diff --git a/config/retired_files.yaml b/config/retired_files.yaml
@@ -4,3 +4,4 @@
 # May be something to investigate.
 retired_files:
   - .readme/static/sdp_overview.png
+  - bors.toml
diff --git a/config/versions.yaml b/config/versions.yaml
@@ -7,7 +7,7 @@ rust_version: 1.85.0
 # This nightly version is only used for cargo fmt invocations, because we use nightly-only
 # rustfmt config options in rustfmt.toml. The version should be kept in line with the version
 # used in the operator-rs repository.
-rust_nightly_version: nightly-2025-01-15
+rust_nightly_version: nightly-2025-05-26
 
 # This edition is mostly used for rustfmt commands and the rustfmt config file. The edition should
 # be kept in line with the edition in the operator-rs repository.
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-Jinja2==3.1.4
+Jinja2==3.1.6
 jinja2-cli==0.8.2
 MarkupSafe==2.1.5
diff --git a/template/.github/pull_request_template.md b/template/.github/pull_request_template.md
@@ -15,6 +15,8 @@
 - [ ] Helm chart can be installed and deployed operator works
 - [ ] Integration tests passed (for non trivial changes)
 - [ ] Changes need to be "offline" compatible
+- [ ] Links to generated (nightly) docs added
+- [ ] Release note snippet added
 
 ### Reviewer
 
@@ -29,4 +31,7 @@
 
 - [ ] Feature Tracker has been updated
 - [ ] Proper release label has been added
-- [ ] [Roadmap](https://github.com/orgs/stackabletech/projects/25/views/1) has been updated
+- [ ] Links to generated (nightly) docs added
+- [ ] Release note snippet added
+- [ ] Add `type/deprecation` label & add to the [deprecation schedule](https://github.com/orgs/stackabletech/projects/44/views/1)
+- [ ] Add `type/experimental` label & add to the [experimental features tracker](https://github.com/orgs/stackabletech/projects/47)
diff --git a/template/.github/workflows/build.yml.j2 b/template/.github/workflows/build.yml.j2
@@ -340,7 +340,7 @@ jobs:
         with:
           persist-credentials: false
           submodules: recursive
-      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31.2.0
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31.4.0
       - uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
@@ -378,7 +378,7 @@ jobs:
       - name: Install cosign
         uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
       - name: Install syft
-        uses: anchore/sbom-action/download-syft@f325610c9f50a54015d37c8d16cb3b0e2c8f4de0 # v0.18.0
+        uses: anchore/sbom-action/download-syft@e11c554f704a0b820cbf8c51673f6945e0731532 # v0.20.0
       - name: Build Docker image and Helm chart
         run: |
           # Installing helm and yq on ubicloud-standard-8-arm only
diff --git a/template/.github/workflows/integration-test.yml b/template/.github/workflows/integration-test.yml
@@ -97,7 +97,7 @@ jobs:
         if: ${{ failure() }}
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_INTEGRATION_TEST_TOKEN }}
-        uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
+        uses: slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3 # v1.27.1
         with:
           channel-id: "C07UYJYSMSN" # notifications-integration-tests
           payload: |
diff --git a/template/.github/workflows/pr_pre-commit.yaml.j2 b/template/.github/workflows/pr_pre-commit.yaml.j2
@@ -26,7 +26,7 @@ jobs:
           persist-credentials: false
           submodules: recursive
           fetch-depth: 0
-      - uses: stackabletech/actions/run-pre-commit@4bfd3b65f22af597fe784599c077dc34bf5894a7 # v0.8.0
+      - uses: stackabletech/actions/run-pre-commit@9aae2d1c14239021bfa33c041010f6fb7adec815 # v0.8.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           rust: ${{ env.RUST_TOOLCHAIN_VERSION }}
diff --git a/template/.hadolint.yaml b/template/.hadolint.yaml
@@ -0,0 +1,11 @@
+---
+ignored:
+  # Warning: Use the -y switch to avoid manual input dnf install -y <package>
+  # https://github.com/hadolint/hadolint/wiki/DL3038
+  # Reason: We set `assumeyes=True` in dnf.conf in our base image
+  - DL3038
+
+  # Warning: Specify version with dnf install -y <package>-<version>
+  # https://github.com/hadolint/hadolint/wiki/DL3041
+  # Reason: It's good advice, but we're not set up to pin versions just yet
+  - DL3041
diff --git a/template/.markdownlint.yaml b/template/.markdownlint.yaml
@@ -22,3 +22,6 @@ MD033:
 MD024:
   # Only check sibling headings
   siblings_only: true
+
+# MD041/first-line-heading/first-line-h1 First line in a file should be a top-level heading
+MD041: false # Github issues and PRs already have titles, and H1 is enormous in the description box.
diff --git a/template/.pre-commit-config.yaml.j2 b/template/.pre-commit-config.yaml.j2
@@ -15,12 +15,12 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: 81e9f98ffd059efe8aa9c1b1a42e5cce61b640c6 # 1.35.1
+    rev: 79a6b2b1392eaf49cdd32ac4f14be1a809bbd8f7 # 1.37.0
     hooks:
       - id: yamllint
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: 586c3ea3f51230da42bab657c6a32e9e66c364f0 # 0.44.0
+    rev: 192ad822316c3a22fb3d3cc8aa6eafa0b8488360 # 0.45.0
     hooks:
       - id: markdownlint
         types: [text]
@@ -36,7 +36,7 @@ repos:
   # If you do not, you will need to delete the cached ruff binary shown in the
   # error message
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 2c8dce6094fa2b4b668e74f694ca63ceffd38614 # 0.9.9
+    rev: d19233b89771be2d89273f163f5edc5a39bbc34a # 0.11.12
     hooks:
       # Run the linter.
       - id: ruff
diff --git a/template/.readme/partials/borrowed/footer.md.j2.j2 b/template/.readme/partials/borrowed/footer.md.j2.j2
@@ -62,3 +62,7 @@ This is enforced automatically when you submit a Pull Request where a bot will g
 ## Support
 
 Get started with the community edition! If you want professional support, [we offer subscription plans and custom licensing](https://stackable.tech/en/plans/).
+
+## Sponsor
+
+If you want to support our work but don't need professional support please consider [sponsoring](https://github.com/sponsors/stackabletech) our work.
diff --git a/template/.readme/partials/borrowed/links.md.j2.j2 b/template/.readme/partials/borrowed/links.md.j2.j2
@@ -1,6 +1,5 @@
 <!-- markdownlint-disable MD041 -->
 {# NOTE: the empty line above is important! -#}
-{% if no_jenkins_job_badge %}{% else %}![Build Actions Status](https://ci.stackable.tech/buildStatus/icon?job={{operator_name}}%2doperator%2dit%2dnightly&subject=Integration%20Tests){% endif %}
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://GitHub.com/stackabletech/{{operator_name}}-operator/graphs/commit-activity)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-green.svg)](https://docs.stackable.tech/home/stable/contributor/index.html)
 [![License OSL3.0](https://img.shields.io/badge/license-OSL3.0-green)](./LICENSE)
diff --git a/template/docker/Dockerfile.j2 b/template/docker/Dockerfile.j2
@@ -1,5 +1,7 @@
-# syntax=docker/dockerfile:1.10.0@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5
+# syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # NOTE: The syntax directive needs to be the first line in a Dockerfile
+# Find the latest versions here: https://hub.docker.com/r/docker/dockerfile/tags
+# And the changelogs: https://docs.docker.com/build/buildkit/dockerfile-release-notes/ or https://github.com/moby/buildkit/releases
 
 # =============
 # This file is automatically generated from the templates in stackabletech/operator-templating
@@ -25,6 +27,13 @@ ARG RELEASE="1"
 ARG STACKABLE_USER_GID="574654813"
 ARG STACKABLE_USER_UID="782252253"
 
+# Sets the default shell to Bash with strict error handling and robust pipeline processing.
+# "-e": Exits immediately if a command exits with a non-zero status
+# "-u": Treats unset variables as an error, preventing unexpected behavior from undefined variables.
+# "-o pipefail": Causes a pipeline to return the exit status of the last command in the pipe that failed, ensuring errors in any part of a pipeline are not ignored.
+# "-c": Allows the execution of commands passed as a string
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
 # These labels have mostly been superceded by the OpenContainer spec annotations below but it doesn't hurt to include them
 # http://label-schema.org/rc1/
 LABEL name="Stackable Operator for {[ operator.pretty_string }]"
@@ -49,7 +58,7 @@ LABEL com.redhat.license_terms=""
 LABEL io.buildah.version=""
 LABEL io.openshift.expose-services=""
 
-# https://github.com/opencontainers/image-spec/blob/036563a4a268d7c08b51a08f05a02a0fe74c7268/annotations.md#annotations
+# https://github.com/opencontainers/image-spec/blob/64294bd7a2bf2537e1a6a34d687caae70300b0c4/annotations.md#annotations
 LABEL org.opencontainers.image.authors="info@stackable.tech"
 LABEL org.opencontainers.image.url="https://stackable.tech"
 LABEL org.opencontainers.image.vendor="Stackable GmbH"
@@ -73,6 +82,8 @@ assumeyes=True
 tsflags=nodocs
 EOF
 
+# It complains about echo flags not being available in POSIX sh but we set the shell to bash
+# hadolint ignore=SC3037
 RUN <<EOF
 # Update image and install kerberos client libraries as well as some other utilities
 microdnf update
diff --git a/template/rust-toolchain.toml.j2 b/template/rust-toolchain.toml.j2
@@ -1,3 +1,4 @@
 # DO NOT EDIT, this file is generated by operator-templating
 [toolchain]
 channel = "{[ rust_version }]"
+profile = "default"
