chore: Merge branch 'main' into feat/provision-public-secret-data-only

Author: Techassi

Cargo.lock

@@ -11,20 +11,27 @@ edition = "2021"
 repository = "https://github.com/stackabletech/secret-operator"
 
 [workspace.dependencies]
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.105.0", features = ["time", "telemetry", "versioned", "webhook"] }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.106.1", features = ["time", "telemetry", "versioned", "webhook"] }
 krb5 = { git = "https://github.com/stackabletech/krb5-rs.git", tag = "v0.1.0" }
 
 anyhow = "1.0"
 async-trait = "0.1"
 built = { version = "0.8", features = ["chrono", "git2"] }
 byteorder = "1.5"
+chrono = "0.4"
 clap = "4.5"
 const_format = "0.2.34"
 futures = { version = "0.3", features = ["compat"] }
 h2 = "0.4"
 hex = "0.4"
-# This version needs to match the kube version that is re-exported by stackable-operator!
-kube-runtime = { git = "https://github.com/stackabletech/kube-rs", branch = "2.0.1-fix-schema-hoisting", version = "=2.0.1", features = ["unstable-runtime-stream-control"] }
+# We can't use the stackable-operator re-export because we need the special "unstable-runtime-stream-control"
+# feature. We don't want to enable it in stackable-operator, as we don't want to accidentally use
+# unstable features.
+# This version needs to match the kube version that is re-exported by stackable-operator, so that
+# the feature unification works!
+kube-runtime = { git = "https://github.com/kube-rs/kube-rs", rev = "fe69cc486ff8e62a7da61d64ec3ebbd9e64c43b5", default-features = false, features = ["unstable-runtime-stream-control"] }
+# Hopefully soon we can switch to
+# kube-runtime = { version = "*", default-features = false, features = ["unstable-runtime-stream-control"] }
 ldap3 = { version = "0.11", default-features = false, features = ["gssapi", "tls"] }
 libc = "0.2"
 native-tls = "0.2"

Cargo.nix

@@ -901,6 +901,7 @@ spec:
                 - tls-pem
                 - tls-pkcs12
                 - kerberos
+                - null
                 nullable: true
                 type: string
               secretClassName:

Cargo.toml

@@ -0,0 +1,13 @@
+<!-- GENERATED BY GIT-CLIFF, DO NOT EDIT MANUALLY -->
+
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [0.1.1] - 2026-02-23
+
+### Features
+
+- Add typed errors and restructure code ([#678](https://github.com/stackabletech/secret-operator/pull/678)).
+
+<!-- GENERATED BY GIT-CLIFF, DO NOT EDIT MANUALLY -->

crate-hashes.json

@@ -1,7 +1,7 @@
 [package]
 name = "cert-tools"
 description = "Merge multiple truststores encoded as PEM or PKCS12 into a JVM compatible format"
-version = "0.0.0-dev"
+version = "0.1.1" # Managed by .scripts/release_cert-tools.sh
 authors.workspace = true
 license.workspace = true
 edition.workspace = true

extra/crds.yaml

@@ -0,0 +1,12 @@
+# Release Process
+
+To release a new version of `cert-tools` the following steps need to be done:
+
+1. Make sure the local `main` branch is up-to-date and in a clean state.
+2. Run the `scripts/release_cert-tools.sh` script. This takes care of
+   - generating the changelog
+   - updating the `Cargo.toml` version
+   - raising a PR with the changes
+3. Merge the PR.
+4. Add the appropriate tag on `main` by running `git tag <TAG> -m <TAG> -s`.
+5. Push the tag.

rust/cert-tools/CHANGELOG.md

@@ -0,0 +1,89 @@
+[bump]
+# We set this to false, because we currently use a 0.X.X version. Features will thus only bump the
+# patch-level version.
+features_always_bump_minor = false
+
+# We set this to false, because we currently use a 0.X.X version. Breaking changes will thus only
+# bump the minor version.
+breaking_always_bump_major = false
+
+initial_tag = "cert-tools-0.1.1"
+
+[git]
+# All commits should be parsed as conventional commits.
+conventional_commits = true
+
+# All unconventional commits are filtered out and ignored.
+filter_unconventional = true
+
+# Commits listed in the changelog are sorted from newest to oldest.
+sort_commits = "newest"
+
+# Filter and ignore all commits NOT matched by the commit parsers below.
+filter_commits = true
+
+commit_parsers = [
+  { message = "^chore\\(cert-tools\\): Release", skip = true },
+  { message = "^feat\\(cert-tools\\)", group = "<!-- 0 --> Features" },
+  { message = "^fix\\(cert-tools\\)", group = "<!-- 1 --> Bug Fixes" },
+  { message = "^docs?\\(cert-tools\\)", group = "<!-- 2 --> Documentation" },
+  { message = "^(perf|refactor|test)\\(cert-tools\\)", group = "<!-- 3 --> Improvements" },
+  { message = "^chore\\(cert-tools\\): Improve", group = "<!-- 3 --> Improvements" },
+  { message = "^chore\\(cert-tools\\)", group = "<!-- 4 --> Miscellaneous" },
+]
+
+commit_preprocessors = [
+  # Replace issue numbers with link templates to be updated in `changelog.postprocessors`.
+  { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](<REPO>/pull/${2}))" },
+]
+
+# Only consider the 'cert-tools-' Git tags when generating the changelog
+tag_pattern = "cert-tools-[0-9]*.[0-9]*.[0-9]*"
+
+# Ignore the first release tag
+skip_tags = "cert-tools-0.1.0"
+
+[changelog]
+trim = true
+
+postprocessors = [
+  # Replace the placeholder `<REPO>` with a URL.
+  { pattern = '<REPO>', replace = "https://github.com/stackabletech/secret-operator" },
+]
+
+header = """<!-- GENERATED BY GIT-CLIFF, DO NOT EDIT MANUALLY -->
+
+# Changelog
+
+All notable changes to this project will be documented in this file.
+"""
+
+body = """
+
+{% if version %}\
+    {% if previous.version %}\
+        ## [{{ version | trim_start_matches(pat="cert-tools-") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+
+        [See complete diff](<REPO>/compare/{{ previous.version }}..{{ version }})
+    {% else %}\
+        ## [{{ version | trim_start_matches(pat="cert-tools-") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+    {% endif %}\
+{% else %}\
+    ## [Unreleased]
+{% endif %}\
+
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | striptags | trim | upper_first }}
+    {% for commit in commits %}
+        - {% if commit.breaking %}**BREAKING:** {% endif %}\
+            {{ commit.message | upper_first }}.\
+    {%- endfor %}
+{% endfor -%}
+
+
+"""
+
+footer = """
+
+<!-- GENERATED BY GIT-CLIFF, DO NOT EDIT MANUALLY -->
+"""

rust/cert-tools/Cargo.toml

@@ -15,9 +15,11 @@ p12 = { path = "../p12" }
 
 anyhow.workspace = true
 async-trait.workspace = true
+chrono.workspace = true
 clap.workspace = true
 futures.workspace = true
 h2.workspace = true
+# We don't directly use this crate, we declare it here to use feature unification
 kube-runtime.workspace = true
 libc.workspace = true
 openssl.workspace = true