fixed fields lookup
update libcrypte and libssl
This commit is contained in:
parent
18a47f8ad2
commit
886fe3783d
@ -16,6 +16,7 @@ LABEL org.opencontainers.image.licenses=MIT
|
|||||||
ARG PYTHON_VERSION=3.10.11-r0
|
ARG PYTHON_VERSION=3.10.11-r0
|
||||||
ARG PIP_VERSION=22.3.1-r1
|
ARG PIP_VERSION=22.3.1-r1
|
||||||
ARG GCOMPAT_VERSION=1.1.0-r0
|
ARG GCOMPAT_VERSION=1.1.0-r0
|
||||||
|
ARG LIBCRYPTO_VERSION=3.0.8-r4
|
||||||
|
|
||||||
COPY --from=builder /tmp/bw /usr/local/bin/bw
|
COPY --from=builder /tmp/bw /usr/local/bin/bw
|
||||||
COPY requirements.txt requirements.txt
|
COPY requirements.txt requirements.txt
|
||||||
@ -26,7 +27,7 @@ RUN set -eux; \
|
|||||||
mkdir -p /home/bw-operator; \
|
mkdir -p /home/bw-operator; \
|
||||||
chown -R bw-operator /home/bw-operator; \
|
chown -R bw-operator /home/bw-operator; \
|
||||||
chmod +x /usr/local/bin/bw; \
|
chmod +x /usr/local/bin/bw; \
|
||||||
apk add gcc musl-dev libstdc++ gcompat=${GCOMPAT_VERSION} python3=${PYTHON_VERSION} py3-pip=${PIP_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; \
|
||||||
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.0"
|
version: "v0.7.1"
|
||||||
|
|
||||||
appVersion: "0.6.0"
|
appVersion: "0.6.1"
|
||||||
|
|
||||||
keywords:
|
keywords:
|
||||||
- operator
|
- operator
|
||||||
@ -93,9 +93,12 @@ annotations:
|
|||||||
enabled: true
|
enabled: true
|
||||||
artifacthub.io/license: MIT
|
artifacthub.io/license: MIT
|
||||||
artifacthub.io/operator: "true"
|
artifacthub.io/operator: "true"
|
||||||
|
artifacthub.io/containsSecurityUpdates: "true"
|
||||||
artifacthub.io/changes: |
|
artifacthub.io/changes: |
|
||||||
- kind: changed
|
- kind: fixed
|
||||||
description: "Use JSON output mode (--response) of Bitwarden CLI."
|
description: "Fixed fields lookup"
|
||||||
|
- kind: fixed
|
||||||
|
description: "Fixed CVE-2023-1255 in base image"
|
||||||
artifacthub.io/images: |
|
artifacthub.io/images: |
|
||||||
- name: bitwarden-crd-operator
|
- name: bitwarden-crd-operator
|
||||||
image: ghcr.io/lerentis/bitwarden-crd-operator:0.6.0
|
image: ghcr.io/lerentis/bitwarden-crd-operator:0.6.1
|
||||||
|
14
example.yaml
14
example.yaml
@ -15,4 +15,18 @@ spec:
|
|||||||
secretScope: login
|
secretScope: login
|
||||||
id: "88781348-c81c-4367-9801-550360c21295"
|
id: "88781348-c81c-4367-9801-550360c21295"
|
||||||
name: "test-secret"
|
name: "test-secret"
|
||||||
|
namespace: "default"
|
||||||
|
---
|
||||||
|
apiVersion: "lerentis.uploadfilter24.eu/v1beta4"
|
||||||
|
kind: BitwardenSecret
|
||||||
|
metadata:
|
||||||
|
name: test-scope
|
||||||
|
spec:
|
||||||
|
content:
|
||||||
|
- element:
|
||||||
|
secretName: public_key
|
||||||
|
secretRef: pubKey
|
||||||
|
secretScope: fields
|
||||||
|
id: "466fc4b0-ffca-4444-8d88-b59d4de3d928"
|
||||||
|
name: "test-scope"
|
||||||
namespace: "default"
|
namespace: "default"
|
@ -46,7 +46,7 @@ def parse_login_scope(secret_json, key):
|
|||||||
|
|
||||||
|
|
||||||
def parse_fields_scope(secret_json, key):
|
def parse_fields_scope(secret_json, key):
|
||||||
if "fields" not in secret_json:
|
if "fields" not in secret_json["data"]:
|
||||||
return None
|
return None
|
||||||
for entry in secret_json["data"]["fields"]:
|
for entry in secret_json["data"]["fields"]:
|
||||||
if entry['name'] == key:
|
if entry['name'] == key:
|
||||||
|
Loading…
Reference in New Issue
Block a user