Skip to content

Commit

Permalink
Merge pull request #30 from Lerentis/Lerentis/issue29
Browse files Browse the repository at this point in the history
  • Loading branch information
Lerentis authored Jun 24, 2023
2 parents aa015cc + 6f099c4 commit 4d36cd4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"; \
Expand Down
10 changes: 5 additions & 5 deletions charts/bitwarden-crd-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions src/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4d36cd4

Please sign in to comment.