From 1128051a5b047e71f9c3366fc97270e6ca36c4e5 Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Sat, 18 May 2024 22:50:18 +0200 Subject: [PATCH] prepare changelog and set ownership to generated secrets --- charts/bitwarden-crd-operator/Chart.yaml | 22 ++++++++++++++++------ src/dockerlogin.py | 5 +++++ src/kv.py | 4 ++++ src/template.py | 4 ++++ 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/charts/bitwarden-crd-operator/Chart.yaml b/charts/bitwarden-crd-operator/Chart.yaml index ecdd652..40ee6a7 100644 --- a/charts/bitwarden-crd-operator/Chart.yaml +++ b/charts/bitwarden-crd-operator/Chart.yaml @@ -4,9 +4,9 @@ description: Deploy the Bitwarden CRD Operator type: application -version: "v0.11.3" +version: "v0.12.0" -appVersion: "0.10.3" +appVersion: "0.11.0" keywords: - operator @@ -102,11 +102,21 @@ annotations: artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/changes: | - kind: changed - description: "Update python to 3.11.8-r0" + description: "Update python to 3.11.9-r0" - kind: changed - description: "Update Node to 20.11.1-r0" + description: "Update Node to 20.12.1-r0" - kind: changed - description: "Unified bw cli installation methode" + description: "Update libcrypto3 to 3.1.4-r5" + - kind: changed + description: "Update alpine to 3.19.1" + - kind: changed + description: "Update kopf to 1.37.2" + - kind: changed + description: "Update jinja to 3.1.4" + - kind: added + description: "Allow custom annotations to generated secrets" + - kind: added + description: "Set ownership of generated secrets" artifacthub.io/images: | - name: bitwarden-crd-operator - image: ghcr.io/lerentis/bitwarden-crd-operator:0.10.3 + image: ghcr.io/lerentis/bitwarden-crd-operator:0.11.0 diff --git a/src/dockerlogin.py b/src/dockerlogin.py index 7adba42..7fc63f0 100644 --- a/src/dockerlogin.py +++ b/src/dockerlogin.py @@ -70,6 +70,8 @@ def create_managed_registry_secret(spec, name, namespace, logger, **kwargs): username_ref, password_ref, registry) + + kopf.append_owner_reference(secret) api.create_namespaced_secret( secret_namespace, secret @@ -147,6 +149,9 @@ def update_managed_registry_secret( username_ref, password_ref, registry) + + kopf.append_owner_reference(secret) + try: api.replace_namespaced_secret( name=secret_name, diff --git a/src/kv.py b/src/kv.py index f299cde..6fb9f32 100644 --- a/src/kv.py +++ b/src/kv.py @@ -62,6 +62,8 @@ def create_managed_secret(spec, name, namespace, logger, body, **kwargs): name=secret_name, annotations=annotations, labels=labels) secret = create_kv(secret, secret_json_object, content_def) + kopf.append_owner_reference(secret) + api.create_namespaced_secret( namespace="{}".format(secret_namespace), body=secret @@ -128,6 +130,8 @@ def update_managed_secret( name=secret_name, annotations=annotations, labels=labels) secret = create_kv(secret, secret_json_object, content_def) + kopf.append_owner_reference(secret) + try: api.replace_namespaced_secret( name=secret_name, diff --git a/src/template.py b/src/template.py index 2654f0c..550416c 100644 --- a/src/template.py +++ b/src/template.py @@ -52,6 +52,8 @@ def create_managed_secret(spec, name, namespace, logger, body, **kwargs): name=secret_name, annotations=annotations, labels=labels) secret = create_template_secret(logger, secret, filename, template) + kopf.append_owner_reference(secret) + api.create_namespaced_secret( secret_namespace, secret ) @@ -118,6 +120,8 @@ def update_managed_secret( name=secret_name, annotations=annotations, labels=labels) secret = create_template_secret(logger, secret, filename, template) + kopf.append_owner_reference(secret) + try: api.replace_namespaced_secret( name=secret_name,