Merge pull request #91 from chrthal/bugfix/secret-recreation

Bugfix/secret recreation

charts/bitwarden-crd-operator/Chart.yaml

@@ -4,9 +4,9 @@ description: Deploy the Bitwarden CRD Operator
 
 type: application
 
-version: "v0.13.0"
+version: "v0.13.1"
 
-appVersion: "0.12.0"
+appVersion: "0.12.1"
 
 keywords:
   - operator
@@ -109,12 +109,8 @@ annotations:
   artifacthub.io/operator: "true"
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/changes: |
-    - kind: added
-      description: "Allow custom type for generated secrets"
-    - kind: added
-      description: "Allow attachments in generated secrets"
-    - kind: added
-      description: "Allow custom type in templated secrets"
+    - kind: fixed
+      description: "Recreation of secrets where secretType is not defined."
   artifacthub.io/images: |
     - name: bitwarden-crd-operator
-      image: ghcr.io/lerentis/bitwarden-crd-operator:0.12.0
+      image: ghcr.io/lerentis/bitwarden-crd-operator:0.12.1

src/kv.py

@@ -112,7 +112,7 @@ def update_managed_secret(
             body.metadata.annotations['kopf.zalando.org/last-handled-configuration'])
         old_secret_name = old_config['spec'].get('name')
         old_secret_namespace = old_config['spec'].get('namespace')
-        old_secret_type = old_config['spec'].get('type')
+        old_secret_type = old_config['spec'].get('secretType')
     secret_name = spec.get('name')
     secret_namespace = spec.get('namespace')
     labels = spec.get('labels')
@@ -122,6 +122,9 @@ def update_managed_secret(
     if not custom_secret_type:
         custom_secret_type = 'Opaque'
 
+    if not old_secret_type:
+        old_secret_type = 'Opaque'
+
     if old_config is not None and (
             old_secret_name != secret_name or old_secret_namespace != secret_namespace or old_secret_type != custom_secret_type):
         # If the name of the secret or the namespace of the secret is different

src/template.py

@@ -103,10 +103,13 @@ def update_managed_secret(
             body.metadata.annotations['kopf.zalando.org/last-handled-configuration'])
         old_secret_name = old_config['spec'].get('name')
         old_secret_namespace = old_config['spec'].get('namespace')
-        old_secret_type = old_config['spec'].get('type')
+        old_secret_type = old_config['spec'].get('secretType')
     secret_name = spec.get('name')
     secret_namespace = spec.get('namespace')
 
+    if not old_secret_type:
+      old_secret_type = 'Opaque'
+
     if old_config is not None and (
             old_secret_name != secret_name or old_secret_namespace != secret_namespace or old_secret_type != custom_secret_type):
         # If the name of the secret or the namespace of the secret is different