Skip to content

Commit 61ebb20

Browse files
Generated commit to update templated files based on rev 9219135 in stackabletech/operator-templating repo. (#643)
Triggered by: Manual run triggered by: NickLarsenNZ with message [deploy new release templates and assorted lint fixes]
1 parent 3a6c018 commit 61ebb20

17 files changed

+117
-17
lines changed

.github/ISSUE_TEMPLATE/new_version.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ assignees: ''
77

88
---
99

10-
**Which new version of Apache NiFi should we support?**
10+
## Which new version of Apache NiFi should we support?
1111

1212
Please specify the version, version range or version numbers to support, please also add these to the issue title
1313

14-
**Additional information**
14+
## Additional information
1515

1616
If possible, provide a link to release notes/changelog
1717

18-
**Changes required**
18+
## Changes required
1919

2020
Are there any upstream changes that we need to support?
2121
e.g. new features, changed features, deprecated features etc.
2222

23+
## Implementation checklist
2324

24-
25-
**Implementation checklist**
26-
27-
Please don't change anything in this list.
28-
Not all of these steps are necessary for all versions.
25+
<!--
26+
Please don't change anything in this list.
27+
Not all of these steps are necessary for all versions.
28+
-->
2929

3030
- [ ] Update the Docker image
3131
- [ ] Update documentation to include supported version(s)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Check and Update Getting Started Script
2+
3+
<!--
4+
Make sure to update the link in 'issues/.github/ISSUE_TEMPLATE/pre-release-getting-started-scripts.md'
5+
when you rename this file.
6+
-->
7+
8+
<!--
9+
Replace 'TRACKING_ISSUE' with the applicable release tracking issue number.
10+
-->
11+
12+
Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
13+
14+
> [!NOTE]
15+
> During a Stackable release we need to check (and optionally update) the
16+
> getting-started scripts to ensure they still work after product and operator
17+
> updates.
18+
19+
```shell
20+
# Some of the scripts are in a code/ subdirectory
21+
# pushd docs/modules/superset/examples/getting_started
22+
# pushd docs/modules/superset/examples/getting_started/code
23+
pushd $(fd -td getting_started | grep examples); cd code 2>/dev/null || true
24+
25+
# Make a fresh cluster (~12 seconds)
26+
kind delete cluster && kind create cluster
27+
./getting_started.sh stackablectl
28+
29+
# Make a fresh cluster (~12 seconds)
30+
kind delete cluster && kind create cluster
31+
./getting_started.sh helm
32+
33+
popd
34+
```
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Bump Rust Dependencies for Stackable Release XX.(X)X
2+
3+
<!--
4+
Make sure to update the link in 'issues/.github/ISSUE_TEMPLATE/pre-release-operator-rust-deps.md'
5+
when you rename this file.
6+
-->
7+
8+
<!--
9+
Replace 'TRACKING_ISSUE' with the applicable release tracking issue number.
10+
-->
11+
12+
Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
13+
14+
> [!NOTE]
15+
> During a Stackable release we need to update various Rust dependencies before
16+
> entering the final release period to ensure we run the latest versions of
17+
> crates. These bumps also include previously updated and released crates from
18+
> the `operator-rs` repository.
19+
20+
```[tasklist]
21+
### Tasks
22+
- [ ] Bump Rust Dependencies, see below for more details.
23+
- [ ] Add changelog entry stating which important crates were bumped (including the version).
24+
```
25+
26+
> [!NOTE]
27+
> The bumping / updating of Rust dependencies is done in multiple steps:
28+
>
29+
> 1. Update the minimum Version in the root `Cargo.toml` manifest.
30+
> 2. Run the `cargo update` command, which also updates the `Cargo.lock` file.
31+
> 3. Lastly, run `make regenerate-nix` to update the `Cargo.nix` file.
32+
33+
```[tasklist]
34+
### Bump Rust Dependencies
35+
- [ ] Bump `stackable-operator` and friends.
36+
- [ ] Bump `product-version`.
37+
- [ ] Bump all other dependencies.
38+
```

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
key: udeps
5858
cache-all-crates: "true"
5959
- uses: stackabletech/cargo-install-action@cargo-udeps
60-
- run: cargo udeps --workspace
60+
- run: cargo udeps --workspace --all-targets
6161

6262
# This job evaluates the github environment to determine why this action is running and selects the appropriate
6363
# target repository for published Helm charts based on this.

.markdownlint.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ MD013:
1414
# Number of characters for code blocks
1515
code_block_line_length: 9999
1616

17+
# MD033/no-inline-html
18+
MD033:
19+
allowed_elements: [h1, img, p]
20+
1721
# MD024/no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
1822
MD024:
1923
# Only check sibling headings

.pre-commit-config.yaml

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
exclude: ^(Cargo\.nix|crate-hashes\.json|nix/.*)$
3+
24
# See https://pre-commit.com for more information
35
# See https://pre-commit.com/hooks.html for more hooks
46
repos:
@@ -28,11 +30,19 @@ repos:
2830
rev: v0.40.0
2931
hooks:
3032
- id: markdownlint
33+
types: [text]
34+
files: \.md(\.j2)*$
3135

32-
- repo: https://github.com/PyCQA/flake8
33-
rev: 7.0.0
36+
# WARNING (@NickLarsenNZ): Nix users need to install ruff first.
37+
# If you do not, you will need to delete the cached ruff binary shown in the
38+
# error message
39+
- repo: https://github.com/astral-sh/ruff-pre-commit
40+
rev: v0.5.1
3441
hooks:
35-
- id: flake8
42+
# Run the linter.
43+
- id: ruff
44+
# Run the formatter.
45+
- id: ruff-format
3646

3747
- repo: local
3848
hooks:

.readme/partials/borrowed/documentation.md.j2

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- markdownlint-disable MD041 -->
12
## Documentation
23

34
The stable documentation for this operator can be found [here](https://docs.stackable.tech/home/stable/{{operator_docs_slug}}).

.readme/partials/borrowed/footer.md.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- markdownlint-disable MD041 -->
12
## About The Stackable Data Platform
23

34
This operator is written and maintained by [Stackable](https://stackable.tech) and it is part of a larger data platform.
@@ -24,7 +25,6 @@ We develop and test our operators on the following cloud platforms:
2425
* Kubernetes (for an up to date list of supported versions please check the release notes in our [docs](https://docs.stackable.tech))
2526
* Red Hat OpenShift
2627

27-
2828
## Other Operators
2929

3030
These are the operators that are currently part of the Stackable Data Platform:

.readme/partials/borrowed/header.md.j2

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- markdownlint-disable MD041 -->
12
<p align="center">
23
<img width="150" src="./.readme/static/borrowed/Icon_Stackable.svg" alt="Stackable Logo"/>
34
</p>

.readme/partials/borrowed/links.md.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
<!-- markdownlint-disable MD041 -->
22
{% 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 %}
33
[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://GitHub.com/stackabletech/{{operator_name}}-operator/graphs/commit-activity)
44
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-green.svg)](https://docs.stackable.tech/home/stable/contributor/index.html)
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
<!-- markdownlint-disable MD041 MD051 -->
12
It is part of the Stackable Data Platform, a curated selection of the best open source data apps like Apache Kafka, Apache Druid, Trino or Apache Spark, [all](#other-operators) working together seamlessly. Based on Kubernetes, it runs everywhere – [on prem or in the cloud](#supported-platforms).

.readme/partials/borrowed/related_reading.md.j2

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- markdownlint-disable MD041 MD022 MD032 -->
12
{%- if related_reading_links -%}
23
## Related Reading
34
{% for (text, link) in related_reading_links %}

README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
<!-- markdownlint-disable MD041 -->
12
<p align="center">
23
<img width="150" src="./.readme/static/borrowed/Icon_Stackable.svg" alt="Stackable Logo"/>
34
</p>
45

56
<h1 align="center">Stackable Operator for Apache NiFi</h1>
67

8+
<!-- markdownlint-disable MD041 -->
79
![Build Actions Status](https://ci.stackable.tech/buildStatus/icon?job=nifi%2doperator%2dit%2dnightly&subject=Integration%20Tests)
810
[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://GitHub.com/stackabletech/nifi-operator/graphs/commit-activity)
911
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-green.svg)](https://docs.stackable.tech/home/stable/contributor/index.html)
@@ -13,6 +15,7 @@
1315

1416
This is a Kubernetes operator to manage [Apache NiFi](https://nifi.apache.org/) clusters.
1517

18+
<!-- markdownlint-disable MD041 MD051 -->
1619
It is part of the Stackable Data Platform, a curated selection of the best open source data apps like Apache Kafka, Apache Druid, Trino or Apache Spark, [all](#other-operators) working together seamlessly. Based on Kubernetes, it runs everywhere – [on prem or in the cloud](#supported-platforms).
1720

1821
## Installation
@@ -25,6 +28,7 @@ Read on to get started with it, or see it in action in one of our [demos](https:
2528

2629
You can follow this [tutorial](https://docs.stackable.tech/home/stable/nifi/getting_started/first_steps) .
2730

31+
<!-- markdownlint-disable MD041 -->
2832
## Documentation
2933

3034
The stable documentation for this operator can be found [here](https://docs.stackable.tech/home/stable/nifi).
@@ -34,6 +38,7 @@ The documentation for all Stackable products can be found at [docs.stackable.tec
3438

3539
If you have a question about the Stackable Data Platform contact us via our [homepage](https://stackable.tech/) or ask a public questions in our [Discussions forum](https://github.com/orgs/stackabletech/discussions).
3640

41+
<!-- markdownlint-disable MD041 -->
3742
## About The Stackable Data Platform
3843

3944
This operator is written and maintained by [Stackable](https://stackable.tech) and it is part of a larger data platform.
@@ -60,7 +65,6 @@ We develop and test our operators on the following cloud platforms:
6065
* Kubernetes (for an up to date list of supported versions please check the release notes in our [docs](https://docs.stackable.tech))
6166
* Red Hat OpenShift
6267

63-
6468
## Other Operators
6569

6670
These are the operators that are currently part of the Stackable Data Platform:
@@ -98,3 +102,5 @@ This is enforced automatically when you submit a Pull Request where a bot will g
98102
## Support
99103

100104
Get started with the community edition! If you want professional support, [we offer subscription plans and custom licensing](https://stackable.tech/en/plans/).
105+
106+
<!-- markdownlint-disable MD041 MD022 MD032 -->

deploy/DO_NOT_EDIT.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# DO NOT EDIT
2+
13
These Helm charts and manifests are automatically generated.
24
Please do not edit anything except for files explicitly mentioned below in this
35
directory manually.

deploy/helm/nifi-operator/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- markdownlint-disable MD034 -->
12
# Helm Chart for Stackable Operator for Apache NiFi
23

34
This Helm Chart can be used to install Custom Resource Definitions and the Operator for Apache NiFi provided by Stackable.
@@ -24,4 +25,4 @@ The operator has example requests included in the [`/examples`](https://github.c
2425

2526
## Links
2627

27-
https://github.com/stackabletech/nifi-operator
28+
<https://github.com/stackabletech/nifi-operator>

scripts/ensure_one_trailing_newline.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Given the location of a file, trims all trailing blank lines and
33
places a single one. Used as post-processing step for README rendering.
44
"""
5+
56
import re
67
import unittest
78

@@ -34,7 +35,6 @@ def process_lines(lines):
3435

3536

3637
class TestCoreMethods(unittest.TestCase):
37-
3838
def test_trailing_new_line(self):
3939
self.assertTrue(has_trailing_newline("something\n"))
4040
self.assertTrue(has_trailing_newline("\n"))

shell.nix

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ in pkgs.mkShell rec {
1111
packages = with pkgs; [
1212
## cargo et-al
1313
rustup # this breaks pkg-config if it is in the nativeBuildInputs
14+
cargo-udeps
1415

1516
## Extra dependencies for use in a pure env (nix-shell --pure)
1617
## These are mosuly useful for maintainers of this shell.nix

0 commit comments

Comments
 (0)