From 856ce452b4ae8f9a0be9d544594fbe36fe6647be Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Wed, 22 Jul 2026 12:15:23 +0000 Subject: [PATCH 1/2] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@5c168f338d5b687d1b2b3585f983b65886cfd8be Reference-to: stackabletech/operator-templating@5c168f3 (Remove product-config) --- .github/ISSUE_TEMPLATE/new_version.md | 35 ------------------- .github/ISSUE_TEMPLATE/normal-issue.md | 16 --------- .../pre-release-rust-deps.md | 1 - .github/workflows/general_daily_security.yml | 5 +++ Makefile | 9 +---- default.nix | 6 ---- .../templates/configmap.yaml | 9 ----- docker/Dockerfile | 1 - nix/meta.json | 2 +- 9 files changed, 7 insertions(+), 77 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/new_version.md delete mode 100644 .github/ISSUE_TEMPLATE/normal-issue.md delete mode 100644 deploy/helm/listener-operator/templates/configmap.yaml diff --git a/.github/ISSUE_TEMPLATE/new_version.md b/.github/ISSUE_TEMPLATE/new_version.md deleted file mode 100644 index 4f7ab039..00000000 --- a/.github/ISSUE_TEMPLATE/new_version.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -name: New Version -about: Request support for a new product version -title: "[NEW VERSION]" -labels: '' -assignees: '' - ---- - -## Which new version of Stackable Listener Operator should we support? - -Please specify the version, version range or version numbers to support, please also add these to the issue title - -## Additional information - -If possible, provide a link to release notes/changelog - -## Changes required - -Are there any upstream changes that we need to support? -e.g. new features, changed features, deprecated features etc. - -## Implementation checklist - - - -- [ ] Update the Docker image -- [ ] Update documentation to include supported version(s) -- [ ] Update and test getting started guide with updated version(s) -- [ ] Update operator to support the new version (if needed) -- [ ] Update integration tests to test use the new versions (in addition or replacing old versions -- [ ] Update examples to use new versions diff --git a/.github/ISSUE_TEMPLATE/normal-issue.md b/.github/ISSUE_TEMPLATE/normal-issue.md deleted file mode 100644 index a518ec71..00000000 --- a/.github/ISSUE_TEMPLATE/normal-issue.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -name: Normal issue -about: This is just a normal empty issue with a simple checklist -title: '' -labels: '' -assignees: '' - ---- - -## Issue checklist - -This is a simple checklist of things to bear in mind when creating a new issue. - -- [ ] Describe the use-case, as far is possible. For instance, using the pattern "As a XXXX, I would like XXXX to be able to do XXXX" helps to identify the feature as well as the problem it is intended to address. -- [ ] Indicate an approximate level of importance and urgency. -- [ ] Indicate if there is a known work-around until such time as the issue has been implemented. diff --git a/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md b/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md index 34eb684d..d525c06a 100644 --- a/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md +++ b/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md @@ -32,5 +32,4 @@ Part of ### Bump Rust Dependencies - [ ] Bump `stackable-operator` and friends -- [ ] Bump `product-config` - [ ] Bump all other dependencies diff --git a/.github/workflows/general_daily_security.yml b/.github/workflows/general_daily_security.yml index d4c7825c..8b76446b 100644 --- a/.github/workflows/general_daily_security.yml +++ b/.github/workflows/general_daily_security.yml @@ -20,5 +20,10 @@ jobs: with: persist-credentials: false - uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # v2.0.0 + # Build against stable because cargo-audit sometimes depends on things + # that require a newer Rust version than our pinned toolchain. This does + # not influence the result, so it should be safe. + env: + RUSTUP_TOOLCHAIN: stable with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Makefile b/Makefile index 9175dea0..c1a192dd 100644 --- a/Makefile +++ b/Makefile @@ -28,22 +28,15 @@ docker-build: docker build --force-rm --build-arg VERSION=${VERSION} -t "${OCI_REGISTRY_HOSTNAME}/${OCI_REGISTRY_PROJECT_IMAGES}/${OPERATOR_NAME}:${VERSION}-${ARCH}" -f docker/Dockerfile . ## Chart related targets -compile-chart: version crds config +compile-chart: version crds chart-clean: - rm -rf "deploy/helm/${OPERATOR_NAME}/configs" rm -rf "deploy/helm/${OPERATOR_NAME}/crds" version: cat "deploy/helm/${OPERATOR_NAME}/Chart.yaml" | yq ".version = \"${VERSION}\" | .appVersion = \"${VERSION}\"" > "deploy/helm/${OPERATOR_NAME}/Chart.yaml.new" mv "deploy/helm/${OPERATOR_NAME}/Chart.yaml.new" "deploy/helm/${OPERATOR_NAME}/Chart.yaml" -config: - if [ -d "deploy/config-spec/" ]; then\ - mkdir -p "deploy/helm/${OPERATOR_NAME}/configs";\ - cp -r deploy/config-spec/* "deploy/helm/${OPERATOR_NAME}/configs";\ - fi - # We generate a crds.yaml, so that the effect of code changes are visible. # The operator will take care of the CRD rollout itself. crds: diff --git a/default.nix b/default.nix index e467de8e..20cc7944 100644 --- a/default.nix +++ b/default.nix @@ -151,12 +151,6 @@ rec { pkgsTarget.util-linuxMinimal ]; config = { - Env = - let - fileRefVars = { - PRODUCT_CONFIG = deploy/config-spec/properties.yaml; - }; - in lib.concatLists (lib.mapAttrsToList (env: path: lib.optional (lib.pathExists path) "${env}=${path}") fileRefVars); Entrypoint = [ entrypoint ]; Cmd = [ "run" ]; }; diff --git a/deploy/helm/listener-operator/templates/configmap.yaml b/deploy/helm/listener-operator/templates/configmap.yaml deleted file mode 100644 index e75acc25..00000000 --- a/deploy/helm/listener-operator/templates/configmap.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -apiVersion: v1 -data: -{{ (.Files.Glob "configs/*").AsConfig | indent 2 }} -kind: ConfigMap -metadata: - name: {{ include "operator.fullname" . }}-configmap - labels: - {{- include "operator.labels" . | nindent 4 }} diff --git a/docker/Dockerfile b/docker/Dockerfile index 1672facc..5f2607c4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -191,7 +191,6 @@ COPY LICENSE /licenses/LICENSE COPY --from=builder --chown=${STACKABLE_USER_UID}:0 /app/* /usr/local/bin/ - USER ${STACKABLE_USER_UID} ENTRYPOINT ["stackable-listener-operator"] diff --git a/nix/meta.json b/nix/meta.json index df385020..26cf6db0 100644 --- a/nix/meta.json +++ b/nix/meta.json @@ -1 +1 @@ -{"operator": {"name": "listener-operator", "pretty_string": "Stackable Listener Operator", "product_string": "listener-operator", "url": "stackabletech/listener-operator.git", "config": {"include_productconfig": false, "has_product": false, "run_as": "custom"}}} +{"operator": {"name": "listener-operator", "pretty_string": "Stackable Listener Operator", "product_string": "listener-operator", "url": "stackabletech/listener-operator.git", "config": {"has_product": false, "run_as": "custom"}}} From 51f47c9882228e8260c2360bdebc47865702a397 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Wed, 22 Jul 2026 15:27:28 +0200 Subject: [PATCH 2/2] chore: Regenerate Nix files --- Cargo.nix | 18 +++++++++--------- crate-hashes.json | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.nix b/Cargo.nix index 51721d6c..e8b70c9d 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -5159,7 +5159,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; rev = "013bbf43f7006a4ddfc08a147f68441ed88b462b"; - sha256 = "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2"; + sha256 = "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr"; }; libName = "k8s_version"; authors = [ @@ -10198,7 +10198,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; rev = "013bbf43f7006a4ddfc08a147f68441ed88b462b"; - sha256 = "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2"; + sha256 = "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr"; }; libName = "stackable_certs"; authors = [ @@ -10476,7 +10476,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; rev = "013bbf43f7006a4ddfc08a147f68441ed88b462b"; - sha256 = "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2"; + sha256 = "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr"; }; libName = "stackable_operator"; authors = [ @@ -10675,7 +10675,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; rev = "013bbf43f7006a4ddfc08a147f68441ed88b462b"; - sha256 = "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2"; + sha256 = "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -10710,7 +10710,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; rev = "013bbf43f7006a4ddfc08a147f68441ed88b462b"; - sha256 = "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2"; + sha256 = "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr"; }; libName = "stackable_shared"; authors = [ @@ -10791,7 +10791,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; rev = "013bbf43f7006a4ddfc08a147f68441ed88b462b"; - sha256 = "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2"; + sha256 = "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr"; }; libName = "stackable_telemetry"; authors = [ @@ -10901,7 +10901,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; rev = "013bbf43f7006a4ddfc08a147f68441ed88b462b"; - sha256 = "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2"; + sha256 = "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr"; }; libName = "stackable_versioned"; authors = [ @@ -10951,7 +10951,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; rev = "013bbf43f7006a4ddfc08a147f68441ed88b462b"; - sha256 = "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2"; + sha256 = "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr"; }; procMacro = true; libName = "stackable_versioned_macros"; @@ -11019,7 +11019,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; rev = "013bbf43f7006a4ddfc08a147f68441ed88b462b"; - sha256 = "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2"; + sha256 = "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr"; }; libName = "stackable_webhook"; authors = [ diff --git a/crate-hashes.json b/crate-hashes.json index 77a93c42..77adf52a 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,12 +1,12 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#k8s-version@0.1.3": "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-certs@0.4.1": "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-operator-derive@0.3.1": "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-operator@0.113.3": "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-shared@0.1.2": "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-telemetry@0.6.5": "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-versioned-macros@0.11.1": "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-versioned@0.11.1": "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-webhook@0.9.2": "1fgc7i8rhq1nl9m4s69sbfiywy2jx4narpynvm3g54vd5yd4c6m2", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#k8s-version@0.1.3": "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-certs@0.4.1": "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-operator-derive@0.3.1": "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-operator@0.113.3": "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-shared@0.1.2": "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-telemetry@0.6.5": "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-versioned-macros@0.11.1": "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-versioned@0.11.1": "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.113.3#stackable-webhook@0.9.2": "1ab5qmawljwbll6b44gw3md57s9kjiy5p16akz6rv52j6fdxjpgr", "git+https://github.com/stackabletech/product-config.git?tag=0.8.0#product-config@0.8.0": "1dz70kapm2wdqcr7ndyjji0lhsl98bsq95gnb2lw487wf6yr7987" } \ No newline at end of file