diff --git a/Dockerfile b/Dockerfile index 64cd5f3..0df6dbf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ LABEL org.opencontainers.image.source=https://github.com/Lerentis/bitwarden-crd- LABEL org.opencontainers.image.description="Kubernetes Operator to create k8s secrets from bitwarden" LABEL org.opencontainers.image.licenses=MIT -ARG PYTHON_VERSION=3.11.3-r11 +ARG PYTHON_VERSION=3.11.4-r0 ARG PIP_VERSION=23.1.2-r0 ARG GCOMPAT_VERSION=1.1.0-r1 ARG LIBCRYPTO_VERSION=3.1.0-r4 @@ -24,6 +24,8 @@ RUN set -eux; \ 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; \ + mv /tmp/bw /usr/local/bin/bw; \ + chmod +x /usr/local/bin/bw; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/charts/bitwarden-crd-operator/Chart.yaml b/charts/bitwarden-crd-operator/Chart.yaml index a76e0e8..9fee9d9 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.7.3" +version: "v0.7.4" -appVersion: "0.6.3" +appVersion: "0.6.4" keywords: - operator @@ -95,8 +95,8 @@ annotations: artifacthub.io/operator: "true" artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/changes: | - - kind: changed - description: "Update Alpine and other dependencies" + - kind: fixed + description: "Fixed bitwarden installation" artifacthub.io/images: | - name: bitwarden-crd-operator - image: ghcr.io/lerentis/bitwarden-crd-operator:0.6.3 + image: ghcr.io/lerentis/bitwarden-crd-operator:0.6.4 diff --git a/src/utils/utils.py b/src/utils/utils.py index f18adf7..630dc9d 100644 --- a/src/utils/utils.py +++ b/src/utils/utils.py @@ -32,9 +32,9 @@ def command_wrapper(logger, command, use_success: bool = True): shell=True, env=system_env) out, err = sp.communicate() - resp = json.loads(out.decode(encoding='UTF-8')) if "DEBUG" in system_env: - logger.info(resp) + logger.info(out.decode(encoding='UTF-8')) + resp = json.loads(out.decode(encoding='UTF-8')) if resp["success"] != None and (not use_success or (use_success and resp["success"] == True)): return resp logger.warn(resp)