mainternence release

Dockerfile

@@ -1,15 +1,15 @@
 FROM alpine:latest as builder
 
-ARG BW_VERSION=2022.11.0
+ARG BW_VERSION=2023.1.0
 
 RUN apk add wget unzip
 
 RUN cd /tmp && wget https://github.com/bitwarden/clients/releases/download/cli-v${BW_VERSION}/bw-linux-${BW_VERSION}.zip && \
     unzip /tmp/bw-linux-${BW_VERSION}.zip
 
-FROM alpine:3.17
+FROM alpine:3.17.2
 
-ARG PYTHON_VERSION=3.10.9-r1
+ARG PYTHON_VERSION=3.10.10-r0
 ARG PIP_VERSION=22.3.1-r1
 ARG GCOMPAT_VERSION=1.1.0-r0
 
@@ -22,7 +22,7 @@ RUN set -eux; \
     mkdir -p /home/bw-operator; \
     chown -R bw-operator /home/bw-operator; \
     chmod +x /usr/local/bin/bw; \
-    apk add gcc musl-dev libstdc++ gcompat=${GCOMPAT_VERSION} python3=${PYTHON_VERSION} py-pip=${PIP_VERSION}; \
+    apk add gcc musl-dev libstdc++ gcompat=${GCOMPAT_VERSION} python3=${PYTHON_VERSION} py3-pip=${PIP_VERSION}; \
     pip install -r requirements.txt --no-warn-script-location; \
     apk del --purge gcc musl-dev libstdc++;
 

charts/bitwarden-crd-operator/Chart.yaml

@@ -4,9 +4,9 @@ description: Deploy the Bitwarden CRD Operator
 
 type: application
 
-version: "v0.5.0"
+version: "v0.5.2"
 
-appVersion: "0.5.0"
+appVersion: "0.5.2"
 
 keywords:
   - operator
@@ -94,12 +94,12 @@ annotations:
   artifacthub.io/license: MIT
   artifacthub.io/operator: "true"  
   artifacthub.io/changes: |
-    - kind: added
-      description: "Implemented update handling"
     - kind: changed
-      description: "Changed default logging structure to json logging"
+      description: "Bump alpine from 3.17.1 to 3.17.2"
     - kind: changed
-      description: "Secrets are periodically updated every 15 minutes"
+      description: "Bump bitwarden cli from 2022.11.0 to 2023.1.0"
+    - kind: changed
+      description: "Bump python version from 3.10.9-r1 to 3.10.10-r0"
   artifacthub.io/images: |
     - name: bitwarden-crd-operator
-      image: lerentis/bitwarden-crd-operator:0.5.0
+      image: lerentis/bitwarden-crd-operator:0.5.1

src/dockerlogin.py

@@ -63,6 +63,25 @@ def update_managed_registry_secret(spec, status, name, namespace, logger, body,
     secret_name = spec.get('name')
     secret_namespace = spec.get('namespace')
 
+
+    old_config = None
+    old_secret_name = None
+    old_secret_namespace = None
+    if 'kopf.zalando.org/last-handled-configuration' in body.metadata.annotations:
+        old_config = json.loads(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')
+    secret_name = spec.get('name')
+    secret_namespace = spec.get('namespace')
+
+    if old_config is not None and (old_secret_name != secret_name or old_secret_namespace != secret_namespace):
+        # If the name of the secret or the namespace of the secret is different
+        # We have to delete the secret an recreate it
+        logger.info("Secret name or namespace changed, let's recreate it")
+        delete_managed_secret(old_config['spec'], name, namespace, logger, **kwargs)
+        create_managed_registry_secret(spec, name, namespace, logger, **kwargs)
+        return
+
     unlock_bw(logger)
     logger.info(f"Locking up secret with ID: {id}")
     secret_json_object = json.loads(get_secret_from_bitwarden(id))

src/template.py

@@ -1,6 +1,7 @@
 import kopf
 import base64
 import kubernetes
+import json
 
 from utils.utils import unlock_bw
 from lookups.bitwarden_lookup import bitwarden_lookup
@@ -57,6 +58,24 @@ def update_managed_secret(spec, status, name, namespace, logger, body, **kwargs)
     secret_name = spec.get('name')
     secret_namespace = spec.get('namespace')
 
+    old_config = None
+    old_secret_name = None
+    old_secret_namespace = None
+    if 'kopf.zalando.org/last-handled-configuration' in body.metadata.annotations:
+        old_config = json.loads(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')
+    secret_name = spec.get('name')
+    secret_namespace = spec.get('namespace')
+
+    if old_config is not None and (old_secret_name != secret_name or old_secret_namespace != secret_namespace):
+        # If the name of the secret or the namespace of the secret is different
+        # We have to delete the secret an recreate it
+        logger.info("Secret name or namespace changed, let's recreate it")
+        delete_managed_secret(old_config['spec'], name, namespace, logger, **kwargs)
+        create_managed_secret(spec, name, namespace, logger, body, **kwargs)
+        return
+
     unlock_bw(logger)
 
     api = kubernetes.client.CoreV1Api()