Update templated files to rev 2ef5a91 (#70)

Automatically created PR based on commit 2ef5a917cce8d1710e1ce0d099947663f74b4428 in stackabletech/operator-templating repo.

Triggered by:
Daily run triggered

Author: stackable-bot

.github/pull_request_template.md

@@ -1,10 +1,12 @@
-## Description
+
+# Description
 
 *Please add a description here. This will become the commit message of the merge request later.*
 
 <!-- Commit message above. Everything below is not added to the message. Do not change this line! -->
 
 ## Review Checklist
+
 - [ ] Code contains useful comments
 - [ ] (Integration-)Test cases added (or not applicable)
 - [ ] Documentation added (or not applicable)

.pre-commit-config.yaml

@@ -2,21 +2,39 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
-    - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v3.2.0
-      hooks:
-          - id: trailing-whitespace
-          - id: end-of-file-fixer
-          - id: detect-aws-credentials
-            args: ["--allow-missing-credentials"]
-          - id: detect-private-key
-    - repo: https://github.com/doublify/pre-commit-rust
-      rev: v1.0
-      hooks:
-          - id: fmt
-          - id: clippy
-            args: ["--all-targets"]
-    - repo: https://github.com/adrienverge/yamllint
-      rev: v1.26.3
-      hooks:
-          - id: yamllint
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.2.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: detect-aws-credentials
+        args: ["--allow-missing-credentials"]
+      - id: detect-private-key
+
+  - repo: https://github.com/doublify/pre-commit-rust
+    rev: v1.0
+    hooks:
+      - id: fmt
+        args: ["--all", "--", "--check"]
+      - id: clippy
+        args: ["--all-targets", "--", "-D", "warnings"]
+
+  - repo: https://github.com/adrienverge/yamllint
+    rev: v1.26.3
+    hooks:
+      - id: yamllint
+
+  - repo: https://github.com/igorshubovych/markdownlint-cli
+    rev: v0.31.1
+    hooks:
+      - id: markdownlint
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
+    hooks:
+      - id: flake8
+
+  - repo: https://github.com/PyCQA/pylint
+    rev: v2.13.9
+    hooks:
+      - id: pylint

Makefile

@@ -31,7 +31,7 @@ docker: docker-build docker-publish
 docker-release: docker-build-latest docker-publish
 
 ## Chart related targets
-compile-chart: version crds config 
+compile-chart: version crds config
 
 chart-clean:
 	rm -rf deploy/helm/spark-k8s-operator/configs

deploy/helm/spark-k8s-operator/README.md

@@ -25,4 +25,3 @@ The operator has example requests included in the [`/examples`](https://github.c
 ## Links
 
 https://github.com/stackabletech/spark-k8s-operator
-

deploy/helm/spark-k8s-operator/templates/_helpers.tpl

@@ -73,4 +73,4 @@ Labels for Kubernetes objects created by helm test
 */}}
 {{- define "operator.testLabels" -}}
 helm.sh/test: {{ include "operator.chart" . }}
-{{- end }}
+{{- end }}

python/cargo_version.py

@@ -5,23 +5,10 @@
 #
 # usage: cargo-version.py [-h] [-p PROJECT] [-r] [-n {major,minor,patch}] [-s SET] [-o] [-m PRERELEASE]
 #
-# Change versions of cargo projects.
-#
-# optional arguments:
-#   -h, --help            show this help message and exit
-#   -p PROJECT, --project PROJECT
-#                         Project folder
-#   -r, --release         Version
-#   -n {major,minor,patch}, --next {major,minor,patch}
-#                         Version
-#   -s SET, --set SET     Version
-#   -o, --show            Version
-#   -m PRERELEASE, --prerelease PRERELEASE
-#                         Set pre-prelease string.
-#
+import argparse
+
 import toml
 import semver
-import argparse
 
 
 class Crate:
@@ -41,20 +28,22 @@ def finalize(cls, version):
 
     @classmethod
     def bump_level(cls, version, level):
-        v = semver.VersionInfo.parse(version)
+        ver = semver.VersionInfo.parse(version)
         if level == "major":
-            return str(v.bump_major())
-        elif level == "minor":
-            return str(v.bump_minor())
-        elif level == "patch":
-            return str(v.bump_patch())
-        else:
-            return str(v.bump_prerelease("nightly"))[:-2]  # remove the .1 suffix that semver always adds to the prererelease.
+            return str(ver.bump_major())
+        if level == "minor":
+            return str(ver.bump_minor())
+        if level == "patch":
+            return str(ver.bump_patch())
+
+        return str(ver.bump_prerelease("nightly"))[
+            :-2
+        ]  # remove the .1 suffix that semver always adds to the prererelease.
 
     @classmethod
     def prerelease(cls, version, prerelease):
-        v = semver.VersionInfo.parse(version)
-        return str(semver.VersionInfo(v.major, v.minor, v.patch, prerelease))
+        ver = semver.VersionInfo.parse(version)
+        return str(semver.VersionInfo(ver.major, ver.minor, ver.patch, prerelease))
 
     def finalize_version(self):
         return Crate(
@@ -94,25 +83,25 @@ def show_version(self):
     def save(self, previous):
         contents = []
         cargo_file = f"{self.path}/Cargo.toml"
-        with open(cargo_file, "r") as r:
-            for line in r.readlines():
+        with open(cargo_file, "r", encoding="utf8") as ctl:
+            for line in ctl.readlines():
                 if line.startswith("version"):
                     line = line.replace(previous.version, self.version)
                 else:
                     for dname, dversion in self.dependencies.items():
                         if line.startswith(dname):
                             line = line.replace(previous.dependencies[dname], dversion)
                 contents.append(line)
-        with open(cargo_file, "w") as w:
-            w.write("".join(contents))
+        with open(cargo_file, "w", encoding="utf8") as ctl:
+            ctl.write("".join(contents))
 
     def __str__(self):
         return f"Crate({self.path}, {self.name}, {self.version}, {self.dependencies})"
 
 
 class Workspace:
     def __init__(self, crates):
-        names = set([c.name for c in crates])
+        names = {c.name for c in crates}
         self.crates = {c.name: c.with_dependencies(names) for c in crates}
 
     def finalize_version(self):
@@ -136,8 +125,8 @@ def next_version(self):
         return Workspace(Workspace.update_dependencies(crates).values())
 
     def show_version(self):
-        for c in self.crates.values():
-            return c.show_version()
+        for cts in self.crates.values():
+            return cts.show_version()
         return "0.0.0"
 
     @classmethod
@@ -151,26 +140,28 @@ def __str__(self):
         return f"Workspace({[str(c) for c in self.crates.values()]})"
 
     def save(self, previous):
-        for cn in self.crates.keys():
-            self.crates[cn].save(previous.crates[cn])
+        for crn in self.crates.keys():
+            self.crates[crn].save(previous.crates[crn])
 
 
 def load(root):
-    r = toml.load(f"{root}/Cargo.toml")
-    if "workspace" in r:
-        return Workspace([load(f"{root}/{path}") for path in r["workspace"]["members"]])
-    else:
-        return Crate(
-            path=root,
-            name=r["package"]["name"],
-            version=r["package"]["version"],
-            dependencies={
-                dn: r["dependencies"][dn]["version"]
-                for dn in r["dependencies"]
-                if "version" in r["dependencies"][dn]
-            },
+    ctl = toml.load(f"{root}/Cargo.toml")
+    if "workspace" in ctl:
+        return Workspace(
+            [load(f"{root}/{path}") for path in ctl["workspace"]["members"]]
         )
 
+    return Crate(
+        path=root,
+        name=ctl["package"]["name"],
+        version=ctl["package"]["version"],
+        dependencies={
+            dn: ctl["dependencies"][dn]["version"]
+            for dn in ctl["dependencies"]
+            if "version" in ctl["dependencies"][dn]
+        },
+    )
+
 
 def parse_args():
     parser = argparse.ArgumentParser(description="Change versions of cargo projects.")