Merge branch 'main' into feat/hbase-resolvable-endpoints

Author: adwk67

.github/workflows/mirror.yaml

@@ -57,7 +57,7 @@ jobs:
           echo "IMAGE_REPOSITORY=$(.scripts/get_repo_name.sh)" | tee -a "$GITHUB_ENV"
 
       - name: Publish Container Image on oci.stackable.tech
-        uses: stackabletech/actions/publish-image@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
+        uses: stackabletech/actions/publish-image@497f3e3cbfe9b89b1e570351b97d050eebcad5d0 # 0.8.3
         with:
           image-registry-uri: oci.stackable.tech
           image-registry-username: robot$sdp+github-action-build
@@ -84,7 +84,7 @@ jobs:
           echo "IMAGE_REPOSITORY=$(.scripts/get_repo_name.sh)" | tee -a "$GITHUB_ENV"
 
       - name: Publish and Sign Image Index Manifest to oci.stackable.tech
-        uses: stackabletech/actions/publish-index-manifest@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
+        uses: stackabletech/actions/publish-index-manifest@497f3e3cbfe9b89b1e570351b97d050eebcad5d0 # 0.8.3
         with:
           image-registry-uri: oci.stackable.tech
           image-registry-username: robot$sdp+github-action-build

.github/workflows/pr_pre-commit.yaml

@@ -16,7 +16,7 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
-      - uses: stackabletech/actions/run-pre-commit@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
+      - uses: stackabletech/actions/run-pre-commit@497f3e3cbfe9b89b1e570351b97d050eebcad5d0 # 0.8.3
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           hadolint: ${{ env.HADOLINT_VERSION }}

.github/workflows/reusable_build_image.yaml

@@ -27,7 +27,7 @@ jobs:
         with:
           persist-credentials: false
       - id: shard
-        uses: stackabletech/actions/shard@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
+        uses: stackabletech/actions/shard@497f3e3cbfe9b89b1e570351b97d050eebcad5d0 # 0.8.3
         with:
           product-name: ${{ inputs.product-name }}
     outputs:
@@ -53,18 +53,18 @@ jobs:
           persist-credentials: false
 
       - name: Free Disk Space
-        uses: stackabletech/actions/free-disk-space@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
+        uses: stackabletech/actions/free-disk-space@497f3e3cbfe9b89b1e570351b97d050eebcad5d0 # 0.8.3
 
       - name: Build Product Image
         id: build
-        uses: stackabletech/actions/build-product-image@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
+        uses: stackabletech/actions/build-product-image@497f3e3cbfe9b89b1e570351b97d050eebcad5d0 # 0.8.3
         with:
           product-name: ${{ inputs.product-name }}
           product-version: ${{ matrix.versions }}
           sdp-version: ${{ inputs.sdp-version }}
 
       - name: Publish Container Image on oci.stackable.tech
-        uses: stackabletech/actions/publish-image@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
+        uses: stackabletech/actions/publish-image@497f3e3cbfe9b89b1e570351b97d050eebcad5d0 # 0.8.3
         with:
           image-registry-uri: oci.stackable.tech
           image-registry-username: robot$${{ inputs.registry-namespace }}+github-action-build
@@ -90,7 +90,7 @@ jobs:
           persist-credentials: false
 
       - name: Publish and Sign Image Index Manifest to oci.stackable.tech
-        uses: stackabletech/actions/publish-index-manifest@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
+        uses: stackabletech/actions/publish-index-manifest@497f3e3cbfe9b89b1e570351b97d050eebcad5d0 # 0.8.3
         with:
           image-registry-uri: oci.stackable.tech
           image-registry-username: robot$${{ inputs.registry-namespace }}+github-action-build

CHANGELOG.md

@@ -114,6 +114,8 @@ All notable changes to this project will be documented in this file.
 - ubi9-rust-builder: Use pinned `rustup` version ([#1121]).
 - hive: Patch for postgres CVE-2024-1597 ([#1100]).
 - bump image-tools (for `bake`) and nixpkgs (for `nodejs_20`, used by pre-commit) ([#1100]).
+- bump image-tools (for `bake`) to fix `RELEASE` arg ([#1188]).
+- nifi: automatically determine NiFi version create reporting task script ([#1189]).
 
 ### Removed
 
@@ -211,6 +213,8 @@ All notable changes to this project will be documented in this file.
 [#1180]: https://github.com/stackabletech/docker-images/pull/1180
 [#1184]: https://github.com/stackabletech/docker-images/pull/1184
 [#1185]: https://github.com/stackabletech/docker-images/pull/1185
+[#1188]: https://github.com/stackabletech/docker-images/pull/1188
+[#1189]: https://github.com/stackabletech/docker-images/pull/1189
 
 ## [25.3.0] - 2025-03-21
 

nifi/python/create_nifi_reporting_task.py

@@ -47,16 +47,19 @@ def find_reporting_task(name: str, port: str):
     return None
 
 
-def create_reporting_task(name: str, port: str, version: str):
+def create_reporting_task(name: str, port: str):
     """Create a ReportingTask"""
+    nifi_version = nipyapi.system.get_system_diagnostics().system_diagnostics.aggregate_snapshot.version_info.ni_fi_version
     task = nipyapi.nifi.models.reporting_task_entity.ReportingTaskEntity(
         revision=nipyapi.nifi.models.revision_dto.RevisionDTO(version=0),
         disconnected_node_acknowledged=False,
         component=nipyapi.nifi.models.reporting_task_dto.ReportingTaskDTO(
             name=name,
             type="org.apache.nifi.reporting.prometheus.PrometheusReportingTask",
             bundle=nipyapi.nifi.models.bundle_dto.BundleDTO(
-                group="org.apache.nifi", artifact="nifi-prometheus-nar", version=version
+                group="org.apache.nifi",
+                artifact="nifi-prometheus-nar",
+                version=nifi_version,
             ),
             properties={
                 "prometheus-reporting-task-metrics-endpoint-port": port,
@@ -125,9 +128,6 @@ def main():
     all_args.add_argument(
         "-p", "--password", required=True, help="Password for the user."
     )
-    all_args.add_argument(
-        "-v", "--nifi_version", required=True, help="The NiFi product version."
-    )
     all_args.add_argument(
         "-c",
         "--cert",
@@ -158,9 +158,7 @@ def main():
     reporting_task = find_reporting_task(name=task_name, port=port)
 
     if reporting_task is None:
-        reporting_task = create_reporting_task(
-            name=task_name, port=port, version=args["nifi_version"]
-        )
+        reporting_task = create_reporting_task(name=task_name, port=port)
         print(
             get_reporting_task_name(task=reporting_task)
             + " [%s] -> CREATED" % reporting_task.id