Compare commits
No commits in common. "682f77e9b8719d7b4f15395fac66c25d20f210c2" and "82b684e46013fb747facdf7077087afa0039ebdc" have entirely different histories.
682f77e9b8
...
82b684e460
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@ -36,7 +36,7 @@ jobs:
|
|||||||
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
|
||||||
- name: Get app version from chart
|
- name: Get app version from chart
|
||||||
uses: mikefarah/yq@v4.34.1
|
uses: mikefarah/yq@v4.33.3
|
||||||
id: app_version
|
id: app_version
|
||||||
with:
|
with:
|
||||||
cmd: yq '.appVersion' charts/bitwarden-crd-operator/Chart.yaml
|
cmd: yq '.appVersion' charts/bitwarden-crd-operator/Chart.yaml
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -166,5 +166,3 @@ lib
|
|||||||
lib64
|
lib64
|
||||||
|
|
||||||
myvalues.yaml
|
myvalues.yaml
|
||||||
|
|
||||||
.vscode
|
|
14
Dockerfile
14
Dockerfile
@ -1,13 +1,13 @@
|
|||||||
FROM alpine:3.18.0
|
FROM alpine:3.17.3
|
||||||
|
|
||||||
LABEL org.opencontainers.image.source=https://github.com/Lerentis/bitwarden-crd-operator
|
LABEL org.opencontainers.image.source=https://github.com/Lerentis/bitwarden-crd-operator
|
||||||
LABEL org.opencontainers.image.description="Kubernetes Operator to create k8s secrets from bitwarden"
|
LABEL org.opencontainers.image.description="Kubernetes Operator to create k8s secrets from bitwarden"
|
||||||
LABEL org.opencontainers.image.licenses=MIT
|
LABEL org.opencontainers.image.licenses=MIT
|
||||||
|
|
||||||
ARG PYTHON_VERSION=3.11.4-r0
|
ARG PYTHON_VERSION=3.10.11-r0
|
||||||
ARG PIP_VERSION=23.1.2-r0
|
ARG PIP_VERSION=22.3.1-r1
|
||||||
ARG GCOMPAT_VERSION=1.1.0-r1
|
ARG GCOMPAT_VERSION=1.1.0-r0
|
||||||
ARG LIBCRYPTO_VERSION=3.1.0-r4
|
ARG LIBCRYPTO_VERSION=3.0.8-r4
|
||||||
ARG BW_VERSION=2023.1.0
|
ARG BW_VERSION=2023.1.0
|
||||||
|
|
||||||
COPY requirements.txt /requirements.txt
|
COPY requirements.txt /requirements.txt
|
||||||
@ -24,8 +24,6 @@ RUN set -eux; \
|
|||||||
cd /tmp; \
|
cd /tmp; \
|
||||||
wget https://github.com/bitwarden/clients/releases/download/cli-v${BW_VERSION}/bw-linux-${BW_VERSION}.zip; \
|
wget https://github.com/bitwarden/clients/releases/download/cli-v${BW_VERSION}/bw-linux-${BW_VERSION}.zip; \
|
||||||
unzip /tmp/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}"; \
|
echo "Unsupported arch: ${ARCH}"; \
|
||||||
@ -37,7 +35,7 @@ RUN set -eux; \
|
|||||||
adduser -S -D -u 1000 -G bw-operator bw-operator; \
|
adduser -S -D -u 1000 -G bw-operator bw-operator; \
|
||||||
mkdir -p /home/bw-operator; \
|
mkdir -p /home/bw-operator; \
|
||||||
chown -R bw-operator /home/bw-operator; \
|
chown -R bw-operator /home/bw-operator; \
|
||||||
apk add gcc musl-dev libstdc++ gcompat=${GCOMPAT_VERSION} python3=${PYTHON_VERSION} py3-pip=${PIP_VERSION} libcrypto3=${LIBCRYPTO_VERSION}; \
|
apk add gcc musl-dev libstdc++ gcompat=${GCOMPAT_VERSION} python3=${PYTHON_VERSION} py3-pip=${PIP_VERSION} libcrypto3=${LIBCRYPTO_VERSION} libssl3=${LIBCRYPTO_VERSION}; \
|
||||||
pip install -r /requirements.txt --no-warn-script-location; \
|
pip install -r /requirements.txt --no-warn-script-location; \
|
||||||
rm /requirements.txt; \
|
rm /requirements.txt; \
|
||||||
apk del --purge gcc musl-dev libstdc++;
|
apk del --purge gcc musl-dev libstdc++;
|
||||||
|
@ -4,9 +4,9 @@ description: Deploy the Bitwarden CRD Operator
|
|||||||
|
|
||||||
type: application
|
type: application
|
||||||
|
|
||||||
version: "v0.7.3"
|
version: "v0.7.2"
|
||||||
|
|
||||||
appVersion: "0.6.3"
|
appVersion: "0.6.2"
|
||||||
|
|
||||||
keywords:
|
keywords:
|
||||||
- operator
|
- operator
|
||||||
@ -95,8 +95,8 @@ annotations:
|
|||||||
artifacthub.io/operator: "true"
|
artifacthub.io/operator: "true"
|
||||||
artifacthub.io/containsSecurityUpdates: "false"
|
artifacthub.io/containsSecurityUpdates: "false"
|
||||||
artifacthub.io/changes: |
|
artifacthub.io/changes: |
|
||||||
- kind: changed
|
- kind: fixed
|
||||||
description: "Update Alpine and other dependencies"
|
description: "Fallback to npm package on ARM as native bitwarden cli package is not compatible with ARM"
|
||||||
artifacthub.io/images: |
|
artifacthub.io/images: |
|
||||||
- name: bitwarden-crd-operator
|
- name: bitwarden-crd-operator
|
||||||
image: ghcr.io/lerentis/bitwarden-crd-operator:0.6.3
|
image: ghcr.io/lerentis/bitwarden-crd-operator:0.6.2
|
||||||
|
@ -32,9 +32,9 @@ def command_wrapper(logger, command, use_success: bool = True):
|
|||||||
shell=True,
|
shell=True,
|
||||||
env=system_env)
|
env=system_env)
|
||||||
out, err = sp.communicate()
|
out, err = sp.communicate()
|
||||||
if "DEBUG" in system_env:
|
|
||||||
logger.info(out.decode(encoding='UTF-8'))
|
|
||||||
resp = json.loads(out.decode(encoding='UTF-8'))
|
resp = json.loads(out.decode(encoding='UTF-8'))
|
||||||
|
if "DEBUG" in system_env:
|
||||||
|
logger.info(resp)
|
||||||
if resp["success"] != None and (not use_success or (use_success and resp["success"] == True)):
|
if resp["success"] != None and (not use_success or (use_success and resp["success"] == True)):
|
||||||
return resp
|
return resp
|
||||||
logger.warn(resp)
|
logger.warn(resp)
|
||||||
|
Loading…
Reference in New Issue
Block a user