From c9d79748cc3079844562193030850eb25a122ac3 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Thu, 14 Aug 2025 06:06:22 +0000 Subject: [PATCH 1/3] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@b1f99f81b4f841e55710cca7384f5946ce845961 Reference-to: stackabletech/operator-templating@b1f99f8 (Templating: Add test retry script and Service on top of operator) --- .../templates/deployment.yaml | 12 ++++++++++++ .../templates/service.yaml | 19 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 deploy/helm/opensearch-operator/templates/service.yaml diff --git a/deploy/helm/opensearch-operator/templates/deployment.yaml b/deploy/helm/opensearch-operator/templates/deployment.yaml index 9056e70..8615cd7 100644 --- a/deploy/helm/opensearch-operator/templates/deployment.yaml +++ b/deploy/helm/opensearch-operator/templates/deployment.yaml @@ -55,6 +55,18 @@ spec: fieldRef: fieldPath: metadata.annotations['internal.stackable.tech/image'] + # Namespace the operator Pod is running in, e.g. used to construct the conversion + # webhook endpoint. + - name: OPERATOR_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + + # The name of the Kubernetes Service that point to the operator Pod, e.g. used to + # construct the conversion webhook endpoint. + - name: OPERATOR_SERVICE_NAME + value: {{ include "operator.fullname" . }} + # Operators need to know the node name they are running on, to e.g. discover the # Kubernetes domain name from the kubelet API. - name: KUBERNETES_NODE_NAME diff --git a/deploy/helm/opensearch-operator/templates/service.yaml b/deploy/helm/opensearch-operator/templates/service.yaml new file mode 100644 index 0000000..0cb0569 --- /dev/null +++ b/deploy/helm/opensearch-operator/templates/service.yaml @@ -0,0 +1,19 @@ + +--- +apiVersion: v1 +kind: Service +metadata: + # Note(@sbernauer): We could also call the Service something like + # "product-operator-conversion-webhook". However, in the future we will have more webhooks, and + # it seems like an overkill to have a dedicated Service per webhook. + name: {{ include "operator.fullname" . }} + labels: + {{- include "operator.labels" . | nindent 4 }} +spec: + selector: + {{- include "operator.selectorLabels" . | nindent 6 }} + ports: + - name: conversion-webhook + protocol: TCP + port: 8443 + targetPort: 8443 From bd968e221a1eb32498854b3b416b7a7ed66dd405 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 14 Aug 2025 08:21:42 +0200 Subject: [PATCH 2/3] Update slab to fix RUSTSEC-2025-0047 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 713d17e..517fa8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2498,9 +2498,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "smallvec" From 3bcdf1313424a7b5ee443912f16a72582ea1efe7 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 14 Aug 2025 08:35:01 +0200 Subject: [PATCH 3/3] Regenerate nix lockfile --- Cargo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.nix b/Cargo.nix index 391f69c..43465e6 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -8188,9 +8188,9 @@ rec { }; "slab" = rec { crateName = "slab"; - version = "0.4.10"; + version = "0.4.11"; edition = "2018"; - sha256 = "03f5a9gdp33mngya4qwq2555138pj74pl015scv57wsic5rikp04"; + sha256 = "12bm4s88rblq02jjbi1dw31984w61y2ldn13ifk5gsqgy97f8aks"; authors = [ "Carl Lerche " ];