Compare commits
127 Commits
Lerentis/i
...
main
Author | SHA1 | Date | |
---|---|---|---|
|
3efa4e68f1 | ||
90a3e9f73d | |||
559c08c187 | |||
|
25b1d0778e | ||
|
9005ea4658 | ||
|
8c46aa2f41 | ||
|
6a4a345688 | ||
|
aef0a5a33c | ||
096bf6b5f6 | |||
ffbf466416 | |||
|
0c0243c407 | ||
|
8f17ee7f17 | ||
|
5dde6160de | ||
|
e141888335 | ||
|
d8dc1a2de9 | ||
fb342b36fc | |||
|
c290d6aeaf | ||
5b445ae668 | |||
baed77e570 | |||
20527b348a | |||
bb50495347 | |||
|
297fb37f13 | ||
|
cd5ebde2ba | ||
|
38459629bc | ||
|
f5b72a18ac | ||
|
1a08ada5e4 | ||
|
e1c8f49c11 | ||
|
892dc90e99 | ||
|
c0a4add3b0 | ||
|
09f978d9fe | ||
|
f679aa1a2b | ||
b01f410f9f | |||
1128051a5b | |||
c9c36f1a37 | |||
|
1820bd06c3 | ||
|
fac9c5ef80 | ||
|
858c85bf2b | ||
|
ac8f6bc8e0 | ||
|
b35670f0fb | ||
|
63728bbc3a | ||
|
8175280a48 | ||
|
907c72e111 | ||
|
f33ae2839d | ||
1758234a1f | |||
30794c10b5 | |||
e58b390c43 | |||
|
b2c7cc5c36 | ||
|
d0753c5c9c | ||
|
d5689ebf6e | ||
|
9320d4dcd6 | ||
|
593526b8ac | ||
|
3ef467ed75 | ||
|
fd1bf9caa2 | ||
2b75b919b2 | |||
be8f21e9c4 | |||
69290f689d | |||
|
aeedda8640 | ||
|
cef07ff4c5 | ||
|
2bf13bc8c5 | ||
48754d4578 | |||
|
a2186ab3aa | ||
9f4264d355 | |||
620d0f0b18 | |||
ac0bc2d89d | |||
f45e9ed6a4 | |||
1d147aad9a | |||
|
e31899b7f2 | ||
|
116c1d9c4e | ||
|
0e08d3cc5e | ||
|
a58f4762d9 | ||
|
f287bd80a1 | ||
|
17fdd4a977 | ||
|
2fde884ad5 | ||
|
cf186e84fb | ||
|
bf5a0b2484 | ||
|
3ba8f49b39 | ||
|
6a8945af21 | ||
|
6160723a72 | ||
|
7527163f26 | ||
|
c6ee9fdc39 | ||
|
313cf7d6e9 | ||
|
8649c4e865 | ||
|
23037bafc1 | ||
|
be98eb9b88 | ||
|
80d8db6924 | ||
|
d6c207ba82 | ||
|
fc37a12737 | ||
|
58b990db2a | ||
|
f3cba82c9f | ||
|
f7a0f43cab | ||
|
382b6776ce | ||
|
94bc6b10b1 | ||
53dae0aaaf | |||
41a085c475 | |||
|
70546b7484 | ||
|
ae5b39bbcb | ||
|
02dfca5a44 | ||
|
31cba57a1a | ||
|
f0a9258b71 | ||
|
63e6f8ab7b | ||
|
9fe5bde4e8 | ||
|
7e0a5b6b57 | ||
|
b7ef2480be | ||
|
25a825b712 | ||
|
963446d9dc | ||
|
bd000cc23a | ||
|
72bb525e9a | ||
|
0bb67e4503 | ||
|
3f35179983 | ||
|
68ffb94870 | ||
|
ddf13aae1c | ||
|
f63e0ac090 | ||
|
39a49ab95b | ||
|
187da26b30 | ||
|
62a2b488d2 | ||
|
bec7476ace | ||
|
d629fa600f | ||
|
ba8c35da9f | ||
|
e85ea8357a | ||
|
69d1af8ba5 | ||
|
293ac2a0b0 | ||
|
5c8d10b060 | ||
|
25ebf35835 | ||
|
1427715823 | ||
|
57b6d69b6b | ||
|
0e33c33415 | ||
|
4d36cd468f |
18
.github/workflows/release.yml
vendored
18
.github/workflows/release.yml
vendored
@ -14,7 +14,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
@ -24,39 +24,39 @@ jobs:
|
|||||||
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
|
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
|
||||||
|
|
||||||
- name: Install Helm
|
- name: Install Helm
|
||||||
uses: azure/setup-helm@v3
|
uses: azure/setup-helm@v4
|
||||||
with:
|
with:
|
||||||
version: v3.10.0
|
version: v3.10.0
|
||||||
|
|
||||||
- name: Run chart-releaser
|
- name: Run chart-releaser
|
||||||
uses: helm/chart-releaser-action@v1.5.0
|
uses: helm/chart-releaser-action@v1.6.0
|
||||||
with:
|
with:
|
||||||
charts_dir: charts
|
charts_dir: charts
|
||||||
env:
|
env:
|
||||||
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.44.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
|
||||||
|
|
||||||
- name: "GHCR Login"
|
- name: "GHCR Login"
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: lerentis
|
username: lerentis
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v2
|
uses: docker/setup-qemu-action@v3
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
- name: "GHCR Build and Push"
|
- name: "GHCR Build and Push"
|
||||||
id: docker_build
|
id: docker_build
|
||||||
uses: docker/build-push-action@v4
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
@ -77,7 +77,7 @@ jobs:
|
|||||||
uses: WyriHaximus/github-action-get-previous-tag@v1
|
uses: WyriHaximus/github-action-get-previous-tag@v1
|
||||||
|
|
||||||
- name: Download SBOM from github action
|
- name: Download SBOM from github action
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: ${{ env.ANCHORE_SBOM_ACTION_PRIOR_ARTIFACT }}
|
name: ${{ env.ANCHORE_SBOM_ACTION_PRIOR_ARTIFACT }}
|
||||||
|
|
||||||
|
29
.github/workflows/test-and-lint.yml
vendored
29
.github/workflows/test-and-lint.yml
vendored
@ -7,22 +7,22 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up Helm
|
- name: Set up Helm
|
||||||
uses: azure/setup-helm@v3
|
uses: azure/setup-helm@v4
|
||||||
with:
|
with:
|
||||||
version: v3.11.2
|
version: v3.11.2
|
||||||
|
|
||||||
- uses: actions/setup-python@v4
|
- uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: '3.9'
|
python-version: '3.9'
|
||||||
check-latest: true
|
check-latest: true
|
||||||
|
|
||||||
- name: Set up chart-testing
|
- name: Set up chart-testing
|
||||||
uses: helm/chart-testing-action@v2.4.0
|
uses: helm/chart-testing-action@v2.6.1
|
||||||
|
|
||||||
- name: Run chart-testing (list-changed)
|
- name: Run chart-testing (list-changed)
|
||||||
id: list-changed
|
id: list-changed
|
||||||
@ -36,20 +36,31 @@ jobs:
|
|||||||
if: steps.list-changed.outputs.changed == 'true'
|
if: steps.list-changed.outputs.changed == 'true'
|
||||||
run: ct lint --target-branch ${{ github.event.repository.default_branch }}
|
run: ct lint --target-branch ${{ github.event.repository.default_branch }}
|
||||||
|
|
||||||
|
- name: Install ah cli
|
||||||
|
run: |
|
||||||
|
export AH_VERSION=1.17.0
|
||||||
|
curl -LO https://github.com/artifacthub/hub/releases/download/v${AH_VERSION}/ah_${AH_VERSION}_linux_amd64.tar.gz
|
||||||
|
tar -xf ah_${AH_VERSION}_linux_amd64.tar.gz
|
||||||
|
chmod +x ./ah
|
||||||
|
sudo mv ./ah /usr/bin/ah
|
||||||
|
rm LICENSE
|
||||||
|
- name: ah lint
|
||||||
|
run: |
|
||||||
|
ah lint
|
||||||
|
|
||||||
pr-build:
|
pr-build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v2
|
uses: docker/setup-qemu-action@v3
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
- name: "GHCR Build"
|
- name: GHCR Build
|
||||||
id: docker_build
|
id: docker_build
|
||||||
uses: docker/build-push-action@v4
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
push: false
|
push: false
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
tags: ghcr.io/lerentis/bitwarden-crd-operator:dev
|
tags: ghcr.io/lerentis/bitwarden-crd-operator:dev
|
||||||
|
|
||||||
|
37
Dockerfile
37
Dockerfile
@ -1,44 +1,29 @@
|
|||||||
FROM alpine:3.18.0
|
FROM alpine:3.20.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.12.6-r0
|
||||||
ARG PIP_VERSION=23.1.2-r0
|
ARG PIP_VERSION=24.0-r2
|
||||||
ARG GCOMPAT_VERSION=1.1.0-r1
|
ARG GCOMPAT_VERSION=1.1.0-r4
|
||||||
ARG LIBCRYPTO_VERSION=3.1.0-r4
|
ARG LIBCRYPTO_VERSION=3.3.2-r0
|
||||||
ARG BW_VERSION=2023.1.0
|
ARG BW_VERSION=2024.7.2
|
||||||
|
ARG NODE_VERSION=20.15.1-r0
|
||||||
|
|
||||||
COPY requirements.txt /requirements.txt
|
COPY requirements.txt /requirements.txt
|
||||||
|
|
||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
apk add --virtual build-dependencies wget unzip; \
|
apk update; \
|
||||||
ARCH="$(apk --print-arch)"; \
|
apk del nodejs-current; \
|
||||||
case "${ARCH}" in \
|
apk add nodejs=${NODE_VERSION} npm; \
|
||||||
aarch64|arm64) \
|
|
||||||
apk add npm; \
|
|
||||||
npm install -g @bitwarden/cli@${BW_VERSION}; \
|
npm install -g @bitwarden/cli@${BW_VERSION}; \
|
||||||
;; \
|
|
||||||
amd64|x86_64) \
|
|
||||||
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}"; \
|
|
||||||
exit 1; \
|
|
||||||
;; \
|
|
||||||
esac; \
|
|
||||||
apk del --purge build-dependencies; \
|
|
||||||
addgroup -S -g 1000 bw-operator; \
|
addgroup -S -g 1000 bw-operator; \
|
||||||
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}; \
|
||||||
pip install -r /requirements.txt --no-warn-script-location; \
|
pip install -r /requirements.txt --no-warn-script-location --break-system-packages; \
|
||||||
rm /requirements.txt; \
|
rm /requirements.txt; \
|
||||||
apk del --purge gcc musl-dev libstdc++;
|
apk del --purge gcc musl-dev libstdc++;
|
||||||
|
|
||||||
|
27
Makefile
Normal file
27
Makefile
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
deployment_name ?= bitwarden-crd-operator
|
||||||
|
namespace ?= bitwarden-crd-operator
|
||||||
|
label_filter = -l app.kubernetes.io/instance=bitwarden-crd-operator -l app.kubernetes.io/name=bitwarden-crd-operator
|
||||||
|
|
||||||
|
create-namespace:
|
||||||
|
kubectl create namespace ${namespace}
|
||||||
|
|
||||||
|
dev:
|
||||||
|
skaffold dev -n ${namespace}
|
||||||
|
|
||||||
|
run:
|
||||||
|
skaffold run -n ${namespace}
|
||||||
|
|
||||||
|
pods:
|
||||||
|
kubectl -n ${namespace} get pods
|
||||||
|
|
||||||
|
desc-pods:
|
||||||
|
kubectl -n ${namespace} describe pod ${label_filter}
|
||||||
|
|
||||||
|
delete-pods-force:
|
||||||
|
kubectl -n ${namespace} delete pod ${label_filter} --force
|
||||||
|
|
||||||
|
exec:
|
||||||
|
kubectl -n ${namespace} exec -it deployment/${deployment_name} -- sh
|
||||||
|
|
||||||
|
logs:
|
||||||
|
kubectl -n ${namespace} logs -f --tail 30 deployment/${deployment_name}
|
77
README.md
77
README.md
@ -56,23 +56,29 @@ And you are set to create your first secret using this operator. For that you ne
|
|||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
---
|
---
|
||||||
apiVersion: "lerentis.uploadfilter24.eu/v1beta4"
|
apiVersion: "lerentis.uploadfilter24.eu/v1beta8"
|
||||||
kind: BitwardenSecret
|
kind: BitwardenSecret
|
||||||
metadata:
|
metadata:
|
||||||
name: name-of-your-management-object
|
name: name-of-your-management-object
|
||||||
spec:
|
spec:
|
||||||
content:
|
content:
|
||||||
- element:
|
- element:
|
||||||
secretName: nameOfTheFieldInBitwarden # for example username
|
secretName: nameOfTheFieldInBitwarden # for example username or filename
|
||||||
secretRef: nameOfTheKeyInTheSecretToBeCreated
|
secretRef: nameOfTheKeyInTheSecretToBeCreated
|
||||||
secretScope: login # for custom entries on bitwarden use 'fields'
|
secretScope: login # for custom entries on bitwarden use 'fields, for attachments use attachment'
|
||||||
- element:
|
- element:
|
||||||
secretName: nameOfAnotherFieldInBitwarden # for example password
|
secretName: nameOfAnotherFieldInBitwarden # for example password or filename
|
||||||
secretRef: nameOfAnotherKeyInTheSecretToBeCreated
|
secretRef: nameOfAnotherKeyInTheSecretToBeCreated
|
||||||
secretScope: login # for custom entries on bitwarden use 'fields'
|
secretScope: login # for custom entries on bitwarden use 'fields, for attachments use attachment'
|
||||||
id: "A Secret ID from bitwarden"
|
id: "A Secret ID from bitwarden"
|
||||||
name: "Name of the secret to be created"
|
name: "Name of the secret to be created"
|
||||||
|
secretType: # Optional (Default: Opaque)
|
||||||
namespace: "Namespace of the secret to be created"
|
namespace: "Namespace of the secret to be created"
|
||||||
|
labels: # Optional
|
||||||
|
key: value
|
||||||
|
annotations: # Optional
|
||||||
|
key: value
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
The ID can be extracted from the browser when you open a item the ID is in the URL. The resulting secret looks something like this:
|
The ID can be extracted from the browser when you open a item the ID is in the URL. The resulting secret looks something like this:
|
||||||
@ -87,6 +93,8 @@ metadata:
|
|||||||
annotations:
|
annotations:
|
||||||
managed: bitwarden-secrets.lerentis.uploadfilter24.eu
|
managed: bitwarden-secrets.lerentis.uploadfilter24.eu
|
||||||
managedObject: bw-operator/test
|
managedObject: bw-operator/test
|
||||||
|
labels:
|
||||||
|
key: value
|
||||||
name: name-of-your-management-object
|
name: name-of-your-management-object
|
||||||
namespace: default
|
namespace: default
|
||||||
type: Opaque
|
type: Opaque
|
||||||
@ -98,7 +106,7 @@ For managing registry credentials, or pull secrets, you can create another kind
|
|||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
---
|
---
|
||||||
apiVersion: "lerentis.uploadfilter24.eu/v1beta4"
|
apiVersion: "lerentis.uploadfilter24.eu/v1beta8"
|
||||||
kind: RegistryCredential
|
kind: RegistryCredential
|
||||||
metadata:
|
metadata:
|
||||||
name: name-of-your-management-object
|
name: name-of-your-management-object
|
||||||
@ -109,6 +117,10 @@ spec:
|
|||||||
id: "A Secret ID from bitwarden"
|
id: "A Secret ID from bitwarden"
|
||||||
name: "Name of the secret to be created"
|
name: "Name of the secret to be created"
|
||||||
namespace: "Namespace of the secret to be created"
|
namespace: "Namespace of the secret to be created"
|
||||||
|
labels: # Optional
|
||||||
|
key: value
|
||||||
|
annotations: # Optional
|
||||||
|
key: value
|
||||||
```
|
```
|
||||||
|
|
||||||
The resulting secret looks something like this:
|
The resulting secret looks something like this:
|
||||||
@ -122,6 +134,8 @@ metadata:
|
|||||||
annotations:
|
annotations:
|
||||||
managed: bitwarden-secrets.lerentis.uploadfilter24.eu
|
managed: bitwarden-secrets.lerentis.uploadfilter24.eu
|
||||||
managedObject: bw-operator/test
|
managedObject: bw-operator/test
|
||||||
|
labels:
|
||||||
|
key: value
|
||||||
name: name-of-your-management-object
|
name: name-of-your-management-object
|
||||||
namespace: default
|
namespace: default
|
||||||
type: dockerconfigjson
|
type: dockerconfigjson
|
||||||
@ -129,28 +143,47 @@ type: dockerconfigjson
|
|||||||
|
|
||||||
## BitwardenTemplate
|
## BitwardenTemplate
|
||||||
|
|
||||||
One of the more freely defined types that can be used with this operator you can just pass a whole template:
|
One of the more freely defined types that can be used with this operator you can just pass a whole template. Also the lookup function `bitwarden_lookup` is available to reference parts of the secret:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
---
|
---
|
||||||
apiVersion: "lerentis.uploadfilter24.eu/v1beta4"
|
apiVersion: "lerentis.uploadfilter24.eu/v1beta8"
|
||||||
kind: BitwardenTemplate
|
kind: BitwardenTemplate
|
||||||
metadata:
|
metadata:
|
||||||
name: name-of-your-management-object
|
name: name-of-your-management-object
|
||||||
spec:
|
spec:
|
||||||
filename: "Key of the secret to be created"
|
|
||||||
name: "Name of the secret to be created"
|
name: "Name of the secret to be created"
|
||||||
|
secretType: # Optional (Default: Opaque)
|
||||||
namespace: "Namespace of the secret to be created"
|
namespace: "Namespace of the secret to be created"
|
||||||
|
labels: # Optional
|
||||||
|
key: value
|
||||||
|
annotations: # Optional
|
||||||
|
key: value
|
||||||
|
content:
|
||||||
|
- element:
|
||||||
|
filename: config.yaml
|
||||||
template: |
|
template: |
|
||||||
---
|
---
|
||||||
api:
|
api:
|
||||||
enabled: True
|
enabled: True
|
||||||
key: {{ bitwarden_lookup("A Secret ID from bitwarden", "login or fields", "name of a field in bitwarden") }}
|
key: {{ bitwarden_lookup("A Secret ID from bitwarden", "login or fields or attachment", "name of a field in bitwarden") }}
|
||||||
allowCrossOrigin: false
|
allowCrossOrigin: false
|
||||||
apps:
|
apps:
|
||||||
"some.app.identifier:some_version":
|
"some.app.identifier:some_version":
|
||||||
pubkey: {{ bitwarden_lookup("A Secret ID from bitwarden", "login or fields", "name of a field in bitwarden") }}
|
pubkey: {{ bitwarden_lookup("A Secret ID from bitwarden", "login or fields or attachment", "name of a field in bitwarden") }}
|
||||||
enabled: true
|
enabled: true
|
||||||
|
- element:
|
||||||
|
filename: config2.yaml
|
||||||
|
template: |
|
||||||
|
---
|
||||||
|
api:
|
||||||
|
enabled: True
|
||||||
|
key: {{ bitwarden_lookup("A Secret ID from bitwarden", "login or fields or attachment", "name of a field in bitwarden") }}
|
||||||
|
allowCrossOrigin: false
|
||||||
|
apps:
|
||||||
|
"some.app.identifier:some_version":
|
||||||
|
pubkey: {{ bitwarden_lookup("A Secret ID from bitwarden", "login or fields or attachment", "name of a field in bitwarden") }}
|
||||||
|
enabled: false
|
||||||
```
|
```
|
||||||
|
|
||||||
This will result in something like the following object:
|
This will result in something like the following object:
|
||||||
@ -164,17 +197,25 @@ metadata:
|
|||||||
annotations:
|
annotations:
|
||||||
managed: bitwarden-template.lerentis.uploadfilter24.eu
|
managed: bitwarden-template.lerentis.uploadfilter24.eu
|
||||||
managedObject: namespace/name-of-your-management-object
|
managedObject: namespace/name-of-your-management-object
|
||||||
|
labels:
|
||||||
|
key: value
|
||||||
name: Name of the secret to be created
|
name: Name of the secret to be created
|
||||||
namespace: Namespace of the secret to be created
|
namespace: Namespace of the secret to be created
|
||||||
type: Opaque
|
type: Opaque
|
||||||
```
|
```
|
||||||
|
|
||||||
please note that the rendering engine for this template is jinja2, with an addition of a custom `bitwarden_lookup` function, so there are more possibilities to inject here.
|
The signature of `bitwarden_lookup` is `(item_id, scope, field)`:
|
||||||
|
- `item_id`: The item ID of the secret in Bitwarden
|
||||||
|
- `scope`: one of `login`, `fields` or `attachment`
|
||||||
|
- `field`:
|
||||||
|
- when `scope` is `login`: either `username` or `password`
|
||||||
|
- when `scope` is `fields`: the name of a custom field
|
||||||
|
- when `scope` is `attachment`: the filename of a file attached to the item
|
||||||
|
|
||||||
## Short Term Roadmap
|
Please note that the rendering engine for this template is jinja2, with an addition of a custom `bitwarden_lookup` function, so there are more possibilities to inject here.
|
||||||
|
|
||||||
- [ ] support more types
|
## Configurations parameters
|
||||||
- [x] offer option to use a existing secret in helm chart
|
|
||||||
- [x] host chart on gh pages
|
The operator uses the bitwarden cli in the background and does not communicate to the api directly. The cli mirrors the credential store locally but doesn't sync it on every get request. Instead it will sync each secret every 15 minutes (900 seconds). You can adjust the interval by setting `BW_SYNC_INTERVAL` in the values. If your secrets update very very frequently, you can force the operator to do a sync before each get by setting `BW_FORCE_SYNC="true"`. You might run into rate limits if you do this too frequent.
|
||||||
- [x] write release pipeline
|
|
||||||
- [x] maybe extend spec to offer modification of keys as well
|
Additionally the bitwarden cli session may expire at some time. In order to create a new session, the login command is triggered from time to time. In what interval exactly can be configured with the env `BW_RELOGIN_INTERVAL` which defaults to `3600` seconds.
|
||||||
|
@ -4,9 +4,9 @@ description: Deploy the Bitwarden CRD Operator
|
|||||||
|
|
||||||
type: application
|
type: application
|
||||||
|
|
||||||
version: "v0.7.4"
|
version: "v0.15.0"
|
||||||
|
|
||||||
appVersion: "0.6.4"
|
appVersion: "0.14.0"
|
||||||
|
|
||||||
keywords:
|
keywords:
|
||||||
- operator
|
- operator
|
||||||
@ -20,7 +20,7 @@ home: https://lerentis.github.io/bitwarden-crd-operator/
|
|||||||
sources:
|
sources:
|
||||||
- https://github.com/Lerentis/bitwarden-crd-operator
|
- https://github.com/Lerentis/bitwarden-crd-operator
|
||||||
|
|
||||||
kubeVersion: ">= 1.23.0-0"
|
kubeVersion: ">= 1.28.0-0"
|
||||||
|
|
||||||
maintainers:
|
maintainers:
|
||||||
- name: lerentis
|
- name: lerentis
|
||||||
@ -32,22 +32,22 @@ annotations:
|
|||||||
url: https://github.com/Lerentis/bitwarden-crd-operator
|
url: https://github.com/Lerentis/bitwarden-crd-operator
|
||||||
artifacthub.io/crds: |
|
artifacthub.io/crds: |
|
||||||
- kind: BitwardenSecret
|
- kind: BitwardenSecret
|
||||||
version: v1beta4
|
version: v1beta8
|
||||||
name: bitwarden-secret
|
name: bitwarden-secret
|
||||||
displayName: Bitwarden Secret
|
displayName: Bitwarden Secret
|
||||||
description: Management Object to create secrets from bitwarden
|
description: Management Object to create secrets from bitwarden
|
||||||
- kind: RegistryCredential
|
- kind: RegistryCredential
|
||||||
version: v1beta4
|
version: v1beta8
|
||||||
name: registry-credential
|
name: registry-credential
|
||||||
displayName: Regestry Credentials
|
displayName: Regestry Credentials
|
||||||
description: Management Object to create regestry secrets from bitwarden
|
description: Management Object to create regestry secrets from bitwarden
|
||||||
- kind: BitwardenTemplate
|
- kind: BitwardenTemplate
|
||||||
version: v1beta1
|
version: v1beta8
|
||||||
name: bitwarden-template
|
name: bitwarden-template
|
||||||
displayName: Bitwarden Template
|
displayName: Bitwarden Template
|
||||||
description: Management Object to create secrets from a jinja template with a bitwarden lookup
|
description: Management Object to create secrets from a jinja template with a bitwarden lookup
|
||||||
artifacthub.io/crdsExamples: |
|
artifacthub.io/crdsExamples: |
|
||||||
- apiVersion: lerentis.uploadfilter24.eu/v1beta4
|
- apiVersion: lerentis.uploadfilter24.eu/v1beta8
|
||||||
kind: BitwardenSecret
|
kind: BitwardenSecret
|
||||||
metadata:
|
metadata:
|
||||||
name: test
|
name: test
|
||||||
@ -61,8 +61,13 @@ annotations:
|
|||||||
secretRef: passwordOfUser
|
secretRef: passwordOfUser
|
||||||
id: "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
|
id: "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
|
||||||
name: "test-secret"
|
name: "test-secret"
|
||||||
|
secretType: Obaque #Optional
|
||||||
namespace: "default"
|
namespace: "default"
|
||||||
- apiVersion: lerentis.uploadfilter24.eu/v1beta4
|
labels:
|
||||||
|
key: value
|
||||||
|
annotations:
|
||||||
|
key: value
|
||||||
|
- apiVersion: lerentis.uploadfilter24.eu/v1beta8
|
||||||
kind: RegistryCredential
|
kind: RegistryCredential
|
||||||
metadata:
|
metadata:
|
||||||
name: test
|
name: test
|
||||||
@ -73,14 +78,25 @@ annotations:
|
|||||||
id: "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
|
id: "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
|
||||||
name: "test-regcred"
|
name: "test-regcred"
|
||||||
namespace: "default"
|
namespace: "default"
|
||||||
- apiVersion: "lerentis.uploadfilter24.eu/v1beta4"
|
labels:
|
||||||
|
key: value
|
||||||
|
annotations:
|
||||||
|
key: value
|
||||||
|
- apiVersion: "lerentis.uploadfilter24.eu/v1beta8"
|
||||||
kind: BitwardenTemplate
|
kind: BitwardenTemplate
|
||||||
metadata:
|
metadata:
|
||||||
name: test
|
name: test
|
||||||
spec:
|
spec:
|
||||||
filename: "config.yaml"
|
|
||||||
name: "test-regcred"
|
name: "test-regcred"
|
||||||
|
secretType: Obaque #Optional
|
||||||
namespace: "default"
|
namespace: "default"
|
||||||
|
labels:
|
||||||
|
key: value
|
||||||
|
annotations:
|
||||||
|
key: value
|
||||||
|
content:
|
||||||
|
- element:
|
||||||
|
filename: "config.yaml"
|
||||||
template: |
|
template: |
|
||||||
---
|
---
|
||||||
api:
|
api:
|
||||||
@ -89,14 +105,21 @@ annotations:
|
|||||||
allowCrossOrigin: false
|
allowCrossOrigin: false
|
||||||
apps:
|
apps:
|
||||||
"some.app.identifier:some_version":
|
"some.app.identifier:some_version":
|
||||||
pubkey: {{ bitwarden_lookup("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", "fields", "public_key") }}
|
pubkey: {{ bitwarden_lookup("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", "attachment", "public_key") }}
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
artifacthub.io/license: MIT
|
artifacthub.io/license: MIT
|
||||||
artifacthub.io/operator: "true"
|
artifacthub.io/operator: "true"
|
||||||
artifacthub.io/containsSecurityUpdates: "false"
|
artifacthub.io/containsSecurityUpdates: "false"
|
||||||
artifacthub.io/changes: |
|
artifacthub.io/changes: |
|
||||||
- kind: fixed
|
- kind: changed
|
||||||
description: "Fixed bitwarden installation"
|
description: "BitwardenTemplate can now handle multiple files"
|
||||||
|
- kind: changed
|
||||||
|
description: "Removed long deprecated versions"
|
||||||
|
- kind: changed
|
||||||
|
description: "Update kubernetes from v29.0.0 to v30.1.0"
|
||||||
|
- kind: changed
|
||||||
|
description: "Update alpine from 3.20.2 to 3.20.3"
|
||||||
artifacthub.io/images: |
|
artifacthub.io/images: |
|
||||||
- name: bitwarden-crd-operator
|
- name: bitwarden-crd-operator
|
||||||
image: ghcr.io/lerentis/bitwarden-crd-operator:0.6.4
|
image: ghcr.io/lerentis/bitwarden-crd-operator:0.14.0
|
||||||
|
@ -13,7 +13,52 @@ spec:
|
|||||||
shortNames:
|
shortNames:
|
||||||
- bws
|
- bws
|
||||||
versions:
|
versions:
|
||||||
- name: v1beta4
|
- name: v1beta7
|
||||||
|
served: true
|
||||||
|
storage: false
|
||||||
|
deprecated: true
|
||||||
|
schema:
|
||||||
|
openAPIV3Schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
spec:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
content:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
element:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
secretName:
|
||||||
|
type: string
|
||||||
|
secretRef:
|
||||||
|
type: string
|
||||||
|
secretScope:
|
||||||
|
type: string
|
||||||
|
required:
|
||||||
|
- secretName
|
||||||
|
id:
|
||||||
|
type: string
|
||||||
|
namespace:
|
||||||
|
type: string
|
||||||
|
name:
|
||||||
|
type: string
|
||||||
|
secretType:
|
||||||
|
type: string
|
||||||
|
labels:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
|
annotations:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
|
required:
|
||||||
|
- id
|
||||||
|
- namespace
|
||||||
|
- name
|
||||||
|
- name: v1beta8
|
||||||
served: true
|
served: true
|
||||||
storage: true
|
storage: true
|
||||||
schema:
|
schema:
|
||||||
@ -45,6 +90,14 @@ spec:
|
|||||||
type: string
|
type: string
|
||||||
name:
|
name:
|
||||||
type: string
|
type: string
|
||||||
|
secretType:
|
||||||
|
type: string
|
||||||
|
labels:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
|
annotations:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
required:
|
required:
|
||||||
- id
|
- id
|
||||||
- namespace
|
- namespace
|
||||||
|
@ -13,9 +13,10 @@ spec:
|
|||||||
shortNames:
|
shortNames:
|
||||||
- bwt
|
- bwt
|
||||||
versions:
|
versions:
|
||||||
- name: v1beta4
|
- name: v1beta7
|
||||||
served: true
|
served: true
|
||||||
storage: true
|
storage: false
|
||||||
|
deprecated: true
|
||||||
schema:
|
schema:
|
||||||
openAPIV3Schema:
|
openAPIV3Schema:
|
||||||
type: object
|
type: object
|
||||||
@ -31,8 +32,56 @@ spec:
|
|||||||
type: string
|
type: string
|
||||||
name:
|
name:
|
||||||
type: string
|
type: string
|
||||||
|
secretType:
|
||||||
|
type: string
|
||||||
|
labels:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
|
annotations:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
required:
|
required:
|
||||||
- filename
|
- filename
|
||||||
- template
|
- template
|
||||||
- namespace
|
- namespace
|
||||||
- name
|
- name
|
||||||
|
- name: v1beta8
|
||||||
|
served: true
|
||||||
|
storage: true
|
||||||
|
schema:
|
||||||
|
openAPIV3Schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
spec:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
namespace:
|
||||||
|
type: string
|
||||||
|
name:
|
||||||
|
type: string
|
||||||
|
secretType:
|
||||||
|
type: string
|
||||||
|
content:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
element:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
filename:
|
||||||
|
type: string
|
||||||
|
template:
|
||||||
|
type: string
|
||||||
|
required:
|
||||||
|
- filename
|
||||||
|
- template
|
||||||
|
labels:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
|
annotations:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
|
required:
|
||||||
|
- namespace
|
||||||
|
- name
|
@ -13,7 +13,43 @@ spec:
|
|||||||
shortNames:
|
shortNames:
|
||||||
- rgc
|
- rgc
|
||||||
versions:
|
versions:
|
||||||
- name: v1beta4
|
- name: v1beta7
|
||||||
|
served: true
|
||||||
|
storage: false
|
||||||
|
deprecated: true
|
||||||
|
schema:
|
||||||
|
openAPIV3Schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
spec:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
usernameRef:
|
||||||
|
type: string
|
||||||
|
passwordRef:
|
||||||
|
type: string
|
||||||
|
registry:
|
||||||
|
type: string
|
||||||
|
id:
|
||||||
|
type: string
|
||||||
|
namespace:
|
||||||
|
type: string
|
||||||
|
name:
|
||||||
|
type: string
|
||||||
|
labels:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
|
annotations:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
|
required:
|
||||||
|
- id
|
||||||
|
- namespace
|
||||||
|
- name
|
||||||
|
- usernameRef
|
||||||
|
- passwordRef
|
||||||
|
- registry
|
||||||
|
- name: v1beta8
|
||||||
served: true
|
served: true
|
||||||
storage: true
|
storage: true
|
||||||
schema:
|
schema:
|
||||||
@ -35,6 +71,12 @@ spec:
|
|||||||
type: string
|
type: string
|
||||||
name:
|
name:
|
||||||
type: string
|
type: string
|
||||||
|
labels:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
|
annotations:
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
required:
|
required:
|
||||||
- id
|
- id
|
||||||
- namespace
|
- namespace
|
||||||
|
@ -8,6 +8,8 @@ spec:
|
|||||||
{{- if not .Values.autoscaling.enabled }}
|
{{- if not .Values.autoscaling.enabled }}
|
||||||
replicas: {{ .Values.replicaCount }}
|
replicas: {{ .Values.replicaCount }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
strategy:
|
||||||
|
type: {{ .Values.deploymentStrategy }}
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
{{- include "bitwarden-crd-operator.selectorLabels" . | nindent 6 }}
|
{{- include "bitwarden-crd-operator.selectorLabels" . | nindent 6 }}
|
||||||
@ -50,10 +52,20 @@ spec:
|
|||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz
|
path: /healthz
|
||||||
port: http
|
port: http
|
||||||
|
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
|
||||||
|
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
|
||||||
|
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
|
||||||
|
successThreshold: {{ .Values.livenessProbe.successThreshold }}
|
||||||
|
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz
|
path: /healthz
|
||||||
port: http
|
port: http
|
||||||
|
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
|
||||||
|
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
|
||||||
|
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
|
||||||
|
successThreshold: {{ .Values.readinessProbe.successThreshold }}
|
||||||
|
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
|
||||||
resources:
|
resources:
|
||||||
{{- toYaml .Values.resources | nindent 12 }}
|
{{- toYaml .Values.resources | nindent 12 }}
|
||||||
{{- with .Values.nodeSelector }}
|
{{- with .Values.nodeSelector }}
|
||||||
|
@ -14,7 +14,13 @@ imagePullSecrets: []
|
|||||||
nameOverride: ""
|
nameOverride: ""
|
||||||
fullnameOverride: ""
|
fullnameOverride: ""
|
||||||
|
|
||||||
|
deploymentStrategy: "Recreate"
|
||||||
|
|
||||||
# env:
|
# env:
|
||||||
|
# - name: BW_FORCE_SYNC
|
||||||
|
# value: "false"
|
||||||
|
# - name: BW_SYNC_INTERVAL
|
||||||
|
# value: "900"
|
||||||
# - name: BW_HOST
|
# - name: BW_HOST
|
||||||
# value: "define_it"
|
# value: "define_it"
|
||||||
# - name: BW_CLIENTID
|
# - name: BW_CLIENTID
|
||||||
@ -23,6 +29,8 @@ fullnameOverride: ""
|
|||||||
# value: "define_it"
|
# value: "define_it"
|
||||||
# - name: BW_PASSWORD
|
# - name: BW_PASSWORD
|
||||||
# value: "define_id"
|
# value: "define_id"
|
||||||
|
## - name: BW_RELOGIN_INTERVAL
|
||||||
|
## value: "3600"
|
||||||
|
|
||||||
externalConfigSecret:
|
externalConfigSecret:
|
||||||
enabled: false
|
enabled: false
|
||||||
@ -51,6 +59,20 @@ securityContext: {}
|
|||||||
# runAsNonRoot: true
|
# runAsNonRoot: true
|
||||||
# runAsUser: 1000
|
# runAsUser: 1000
|
||||||
|
|
||||||
|
readinessProbe:
|
||||||
|
failureThreshold: 3
|
||||||
|
initialDelaySeconds: 10
|
||||||
|
periodSeconds: 10
|
||||||
|
successThreshold: 1
|
||||||
|
timeoutSeconds: 1
|
||||||
|
|
||||||
|
livenessProbe:
|
||||||
|
failureThreshold: 3
|
||||||
|
initialDelaySeconds: 10
|
||||||
|
periodSeconds: 10
|
||||||
|
successThreshold: 1
|
||||||
|
timeoutSeconds: 1
|
||||||
|
|
||||||
resources: {}
|
resources: {}
|
||||||
# We usually recommend not to specify default resources and to leave this as a conscious
|
# We usually recommend not to specify default resources and to leave this as a conscious
|
||||||
# choice for the user. This also increases chances charts run on environments with little
|
# choice for the user. This also increases chances charts run on environments with little
|
||||||
|
11
example.yaml
11
example.yaml
@ -1,8 +1,9 @@
|
|||||||
---
|
---
|
||||||
apiVersion: "lerentis.uploadfilter24.eu/v1beta4"
|
apiVersion: "lerentis.uploadfilter24.eu/v1beta8"
|
||||||
kind: BitwardenSecret
|
kind: BitwardenSecret
|
||||||
metadata:
|
metadata:
|
||||||
name: test
|
name: test
|
||||||
|
namespace: default
|
||||||
spec:
|
spec:
|
||||||
content:
|
content:
|
||||||
- element:
|
- element:
|
||||||
@ -15,9 +16,15 @@ spec:
|
|||||||
secretScope: login
|
secretScope: login
|
||||||
id: "88781348-c81c-4367-9801-550360c21295"
|
id: "88781348-c81c-4367-9801-550360c21295"
|
||||||
name: "test-secret"
|
name: "test-secret"
|
||||||
|
secretType: Opaque
|
||||||
namespace: "default"
|
namespace: "default"
|
||||||
|
labels:
|
||||||
|
key: value
|
||||||
|
app: example-app
|
||||||
|
annotations:
|
||||||
|
custom.annotation: is-used
|
||||||
---
|
---
|
||||||
apiVersion: "lerentis.uploadfilter24.eu/v1beta4"
|
apiVersion: "lerentis.uploadfilter24.eu/v1beta8"
|
||||||
kind: BitwardenSecret
|
kind: BitwardenSecret
|
||||||
metadata:
|
metadata:
|
||||||
name: test-scope
|
name: test-scope
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
apiVersion: "lerentis.uploadfilter24.eu/v1beta4"
|
apiVersion: "lerentis.uploadfilter24.eu/v1beta8"
|
||||||
kind: RegistryCredential
|
kind: RegistryCredential
|
||||||
metadata:
|
metadata:
|
||||||
name: test
|
name: test
|
||||||
@ -10,3 +10,8 @@ spec:
|
|||||||
id: "3b249ec7-9ce7-440a-9558-f34f3ab10680"
|
id: "3b249ec7-9ce7-440a-9558-f34f3ab10680"
|
||||||
name: "test-regcred"
|
name: "test-regcred"
|
||||||
namespace: "default"
|
namespace: "default"
|
||||||
|
labels:
|
||||||
|
namespace: default
|
||||||
|
tenant: example-team
|
||||||
|
annotations:
|
||||||
|
custom.annotation: is-used
|
@ -1,12 +1,19 @@
|
|||||||
---
|
---
|
||||||
apiVersion: "lerentis.uploadfilter24.eu/v1beta4"
|
apiVersion: "lerentis.uploadfilter24.eu/v1beta8"
|
||||||
kind: BitwardenTemplate
|
kind: BitwardenTemplate
|
||||||
metadata:
|
metadata:
|
||||||
name: test
|
name: test
|
||||||
spec:
|
spec:
|
||||||
filename: "config.yaml"
|
|
||||||
name: "test-template"
|
name: "test-template"
|
||||||
namespace: "default"
|
namespace: "default"
|
||||||
|
labels:
|
||||||
|
key: value
|
||||||
|
app: example-app
|
||||||
|
annotations:
|
||||||
|
custom.annotation: is-used
|
||||||
|
content:
|
||||||
|
- element:
|
||||||
|
filename: config.yaml
|
||||||
template: |
|
template: |
|
||||||
---
|
---
|
||||||
api:
|
api:
|
||||||
@ -17,3 +24,15 @@ spec:
|
|||||||
"some.app.identifier:some_version":
|
"some.app.identifier:some_version":
|
||||||
pubkey: {{ bitwarden_lookup("466fc4b0-ffca-4444-8d88-b59d4de3d928", "fields", "public_key") }}
|
pubkey: {{ bitwarden_lookup("466fc4b0-ffca-4444-8d88-b59d4de3d928", "fields", "public_key") }}
|
||||||
enabled: true
|
enabled: true
|
||||||
|
- element:
|
||||||
|
filename: config2.yaml
|
||||||
|
template: |
|
||||||
|
---
|
||||||
|
api:
|
||||||
|
enabled: True
|
||||||
|
key: {{ bitwarden_lookup("466fc4b0-ffca-4444-8d88-b59d4de3d928", "fields", "key") }}
|
||||||
|
allowCrossOrigin: false
|
||||||
|
apps:
|
||||||
|
"some.app.identifier:some_version":
|
||||||
|
pubkey: {{ bitwarden_lookup("466fc4b0-ffca-4444-8d88-b59d4de3d928", "fields", "public_key") }}
|
||||||
|
enabled: false
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
kopf==1.36.1
|
kopf==1.37.2
|
||||||
kubernetes==26.1.0
|
kubernetes==30.1.0
|
||||||
Jinja2==3.1.2
|
Jinja2==3.1.4
|
||||||
|
schedule==1.2.2
|
57
skaffold.yaml
Normal file
57
skaffold.yaml
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
apiVersion: skaffold/v4beta9
|
||||||
|
kind: Config
|
||||||
|
metadata:
|
||||||
|
name: bitwarden-crd-operator
|
||||||
|
build:
|
||||||
|
tagPolicy:
|
||||||
|
sha256: {}
|
||||||
|
artifacts:
|
||||||
|
- image: ghcr.io/lerentis/bitwarden-crd-operator
|
||||||
|
docker:
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
deploy:
|
||||||
|
helm:
|
||||||
|
releases:
|
||||||
|
- name: bitwarden-crd-operator
|
||||||
|
chartPath: charts/bitwarden-crd-operator
|
||||||
|
valuesFiles:
|
||||||
|
- ./charts/bitwarden-crd-operator/myvalues.yaml
|
||||||
|
setValueTemplates:
|
||||||
|
image.repository: "{{.IMAGE_REPO_ghcr_io_lerentis_bitwarden_crd_operator}}"
|
||||||
|
image.tag: "{{.IMAGE_TAG_ghcr_io_lerentis_bitwarden_crd_operator}}@{{.IMAGE_DIGEST_ghcr_io_lerentis_bitwarden_crd_operator}}"
|
||||||
|
hooks:
|
||||||
|
after:
|
||||||
|
- host:
|
||||||
|
command:
|
||||||
|
- kubectl
|
||||||
|
- apply
|
||||||
|
- -f
|
||||||
|
- ./example*.yaml
|
||||||
|
- host:
|
||||||
|
command:
|
||||||
|
- sleep
|
||||||
|
- '5'
|
||||||
|
- host:
|
||||||
|
command:
|
||||||
|
- kubectl
|
||||||
|
- get
|
||||||
|
- secret
|
||||||
|
- test-regcred
|
||||||
|
- host:
|
||||||
|
command:
|
||||||
|
- kubectl
|
||||||
|
- get
|
||||||
|
- secret
|
||||||
|
- test-scope
|
||||||
|
- host:
|
||||||
|
command:
|
||||||
|
- kubectl
|
||||||
|
- get
|
||||||
|
- secret
|
||||||
|
- test-secret
|
||||||
|
- host:
|
||||||
|
command:
|
||||||
|
- kubectl
|
||||||
|
- get
|
||||||
|
- secret
|
||||||
|
- test-template
|
@ -1,11 +1,12 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
import os
|
import os
|
||||||
import kopf
|
import kopf
|
||||||
|
import schedule
|
||||||
|
import time
|
||||||
|
import threading
|
||||||
|
|
||||||
from utils.utils import command_wrapper, unlock_bw
|
from utils.utils import command_wrapper, unlock_bw, sync_bw
|
||||||
|
|
||||||
|
|
||||||
@kopf.on.startup()
|
|
||||||
def bitwarden_signin(logger, **kwargs):
|
def bitwarden_signin(logger, **kwargs):
|
||||||
if 'BW_HOST' in os.environ:
|
if 'BW_HOST' in os.environ:
|
||||||
try:
|
try:
|
||||||
@ -18,3 +19,29 @@ def bitwarden_signin(logger, **kwargs):
|
|||||||
logger.info("BW_HOST not set. Assuming SaaS installation")
|
logger.info("BW_HOST not set. Assuming SaaS installation")
|
||||||
command_wrapper(logger, "login --apikey")
|
command_wrapper(logger, "login --apikey")
|
||||||
unlock_bw(logger)
|
unlock_bw(logger)
|
||||||
|
|
||||||
|
def run_continuously(interval=30):
|
||||||
|
cease_continuous_run = threading.Event()
|
||||||
|
|
||||||
|
class ScheduleThread(threading.Thread):
|
||||||
|
@classmethod
|
||||||
|
def run(cls):
|
||||||
|
while not cease_continuous_run.is_set():
|
||||||
|
schedule.run_pending()
|
||||||
|
time.sleep(interval)
|
||||||
|
|
||||||
|
continuous_thread = ScheduleThread()
|
||||||
|
continuous_thread.start()
|
||||||
|
return cease_continuous_run
|
||||||
|
|
||||||
|
@kopf.on.startup()
|
||||||
|
def load_schedules(logger, **kwargs):
|
||||||
|
bitwarden_signin(logger)
|
||||||
|
logger.info("Loading schedules")
|
||||||
|
bw_relogin_interval = float(os.environ.get('BW_RELOGIN_INTERVAL', 3600))
|
||||||
|
bw_sync_interval = float(os.environ.get('BW_SYNC_INTERVAL', 900))
|
||||||
|
schedule.every(bw_relogin_interval).seconds.do(bitwarden_signin, logger=logger)
|
||||||
|
logger.info(f"relogin scheduled every {bw_relogin_interval} seconds")
|
||||||
|
schedule.every(bw_sync_interval).seconds.do(sync_bw, logger=logger)
|
||||||
|
logger.info(f"sync scheduled every {bw_relogin_interval} seconds")
|
||||||
|
stop_run_continuously = run_continuously()
|
||||||
|
@ -3,7 +3,7 @@ import kubernetes
|
|||||||
import base64
|
import base64
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from utils.utils import unlock_bw, get_secret_from_bitwarden
|
from utils.utils import unlock_bw, get_secret_from_bitwarden, bw_sync_interval
|
||||||
|
|
||||||
|
|
||||||
def create_dockerlogin(
|
def create_dockerlogin(
|
||||||
@ -13,7 +13,7 @@ def create_dockerlogin(
|
|||||||
username_ref,
|
username_ref,
|
||||||
password_ref,
|
password_ref,
|
||||||
registry):
|
registry):
|
||||||
secret.type = "dockerconfigjson"
|
secret.type = "kubernetes.io/dockerconfigjson"
|
||||||
secret.data = {}
|
secret.data = {}
|
||||||
auths_dict = {}
|
auths_dict = {}
|
||||||
registry_dict = {}
|
registry_dict = {}
|
||||||
@ -26,7 +26,8 @@ def create_dockerlogin(
|
|||||||
base64.b64encode(
|
base64.b64encode(
|
||||||
f"{_username}:{_password}".encode("utf-8")),
|
f"{_username}:{_password}".encode("utf-8")),
|
||||||
"utf-8")
|
"utf-8")
|
||||||
|
reg_auth_dict["username"] = _username
|
||||||
|
reg_auth_dict["password"] = _password
|
||||||
reg_auth_dict["auth"] = cred_field
|
reg_auth_dict["auth"] = cred_field
|
||||||
registry_dict[registry] = reg_auth_dict
|
registry_dict[registry] = reg_auth_dict
|
||||||
auths_dict["auths"] = registry_dict
|
auths_dict["auths"] = registry_dict
|
||||||
@ -43,6 +44,8 @@ def create_managed_registry_secret(spec, name, namespace, logger, **kwargs):
|
|||||||
id = spec.get('id')
|
id = spec.get('id')
|
||||||
secret_name = spec.get('name')
|
secret_name = spec.get('name')
|
||||||
secret_namespace = spec.get('namespace')
|
secret_namespace = spec.get('namespace')
|
||||||
|
labels = spec.get('labels')
|
||||||
|
custom_annotations = spec.get('annotations')
|
||||||
|
|
||||||
unlock_bw(logger)
|
unlock_bw(logger)
|
||||||
logger.info(f"Locking up secret with ID: {id}")
|
logger.info(f"Locking up secret with ID: {id}")
|
||||||
@ -54,9 +57,16 @@ def create_managed_registry_secret(spec, name, namespace, logger, **kwargs):
|
|||||||
"managed": "registry-credential.lerentis.uploadfilter24.eu",
|
"managed": "registry-credential.lerentis.uploadfilter24.eu",
|
||||||
"managedObject": f"{namespace}/{name}"
|
"managedObject": f"{namespace}/{name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if custom_annotations:
|
||||||
|
annotations.update(custom_annotations)
|
||||||
|
|
||||||
|
if not labels:
|
||||||
|
labels = {}
|
||||||
|
|
||||||
secret = kubernetes.client.V1Secret()
|
secret = kubernetes.client.V1Secret()
|
||||||
secret.metadata = kubernetes.client.V1ObjectMeta(
|
secret.metadata = kubernetes.client.V1ObjectMeta(
|
||||||
name=secret_name, annotations=annotations)
|
name=secret_name, annotations=annotations, labels=labels)
|
||||||
secret = create_dockerlogin(
|
secret = create_dockerlogin(
|
||||||
logger,
|
logger,
|
||||||
secret,
|
secret,
|
||||||
@ -65,7 +75,12 @@ def create_managed_registry_secret(spec, name, namespace, logger, **kwargs):
|
|||||||
password_ref,
|
password_ref,
|
||||||
registry)
|
registry)
|
||||||
|
|
||||||
obj = api.create_namespaced_secret(
|
# Garbage collection will delete the generated secret if the owner
|
||||||
|
# Is not in the same namespace as the generated secret
|
||||||
|
if secret_namespace == namespace:
|
||||||
|
kopf.append_owner_reference(secret)
|
||||||
|
|
||||||
|
api.create_namespaced_secret(
|
||||||
secret_namespace, secret
|
secret_namespace, secret
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -74,7 +89,7 @@ def create_managed_registry_secret(spec, name, namespace, logger, **kwargs):
|
|||||||
|
|
||||||
|
|
||||||
@kopf.on.update('registry-credential.lerentis.uploadfilter24.eu')
|
@kopf.on.update('registry-credential.lerentis.uploadfilter24.eu')
|
||||||
@kopf.timer('registry-credential.lerentis.uploadfilter24.eu', interval=900)
|
@kopf.timer('registry-credential.lerentis.uploadfilter24.eu', interval=bw_sync_interval)
|
||||||
def update_managed_registry_secret(
|
def update_managed_registry_secret(
|
||||||
spec,
|
spec,
|
||||||
status,
|
status,
|
||||||
@ -90,6 +105,8 @@ def update_managed_registry_secret(
|
|||||||
id = spec.get('id')
|
id = spec.get('id')
|
||||||
secret_name = spec.get('name')
|
secret_name = spec.get('name')
|
||||||
secret_namespace = spec.get('namespace')
|
secret_namespace = spec.get('namespace')
|
||||||
|
labels = spec.get('labels')
|
||||||
|
custom_annotations = spec.get('annotations')
|
||||||
|
|
||||||
old_config = None
|
old_config = None
|
||||||
old_secret_name = None
|
old_secret_name = None
|
||||||
@ -126,9 +143,16 @@ def update_managed_registry_secret(
|
|||||||
"managed": "registry-credential.lerentis.uploadfilter24.eu",
|
"managed": "registry-credential.lerentis.uploadfilter24.eu",
|
||||||
"managedObject": f"{namespace}/{name}"
|
"managedObject": f"{namespace}/{name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if custom_annotations:
|
||||||
|
annotations.update(custom_annotations)
|
||||||
|
|
||||||
|
if not labels:
|
||||||
|
labels = {}
|
||||||
|
|
||||||
secret = kubernetes.client.V1Secret()
|
secret = kubernetes.client.V1Secret()
|
||||||
secret.metadata = kubernetes.client.V1ObjectMeta(
|
secret.metadata = kubernetes.client.V1ObjectMeta(
|
||||||
name=secret_name, annotations=annotations)
|
name=secret_name, annotations=annotations, labels=labels)
|
||||||
secret = create_dockerlogin(
|
secret = create_dockerlogin(
|
||||||
logger,
|
logger,
|
||||||
secret,
|
secret,
|
||||||
@ -136,16 +160,25 @@ def update_managed_registry_secret(
|
|||||||
username_ref,
|
username_ref,
|
||||||
password_ref,
|
password_ref,
|
||||||
registry)
|
registry)
|
||||||
|
|
||||||
|
# Garbage collection will delete the generated secret if the owner
|
||||||
|
# Is not in the same namespace as the generated secret
|
||||||
|
if secret_namespace == namespace:
|
||||||
|
kopf.append_owner_reference(secret)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
obj = api.replace_namespaced_secret(
|
api.replace_namespaced_secret(
|
||||||
name=secret_name,
|
name=secret_name,
|
||||||
body=secret,
|
body=secret,
|
||||||
namespace="{}".format(secret_namespace))
|
namespace="{}".format(secret_namespace))
|
||||||
logger.info(
|
logger.info(
|
||||||
f"Secret {secret_namespace}/{secret_name} has been updated")
|
f"Secret {secret_namespace}/{secret_name} has been updated")
|
||||||
except BaseException:
|
except BaseException as e:
|
||||||
logger.warn(
|
logger.warn(
|
||||||
f"Could not update secret {secret_namespace}/{secret_name}!")
|
f"Could not update secret {secret_namespace}/{secret_name}!")
|
||||||
|
logger.warn(
|
||||||
|
f"Exception: {e}"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@kopf.on.delete('registry-credential.lerentis.uploadfilter24.eu')
|
@kopf.on.delete('registry-credential.lerentis.uploadfilter24.eu')
|
||||||
|
78
src/kv.py
78
src/kv.py
@ -3,11 +3,9 @@ import kubernetes
|
|||||||
import base64
|
import base64
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from utils.utils import unlock_bw, get_secret_from_bitwarden, parse_login_scope, parse_fields_scope
|
from utils.utils import unlock_bw, get_secret_from_bitwarden, parse_login_scope, parse_fields_scope, get_attachment, bw_sync_interval
|
||||||
|
|
||||||
|
def create_kv(logger, id, secret, secret_json, content_def):
|
||||||
def create_kv(secret, secret_json, content_def):
|
|
||||||
secret.type = "Opaque"
|
|
||||||
secret.data = {}
|
secret.data = {}
|
||||||
for eleml in content_def:
|
for eleml in content_def:
|
||||||
for k, elem in eleml.items():
|
for k, elem in eleml.items():
|
||||||
@ -32,6 +30,13 @@ def create_kv(secret, secret_json, content_def):
|
|||||||
f"Field {_secret_key} has no value in bitwarden secret")
|
f"Field {_secret_key} has no value in bitwarden secret")
|
||||||
secret.data[_secret_ref] = str(base64.b64encode(
|
secret.data[_secret_ref] = str(base64.b64encode(
|
||||||
value.encode("utf-8")), "utf-8")
|
value.encode("utf-8")), "utf-8")
|
||||||
|
if _secret_scope == "attachment":
|
||||||
|
value = get_attachment(logger, id, _secret_key)
|
||||||
|
if value is None:
|
||||||
|
raise Exception(
|
||||||
|
f"Attachment {_secret_key} has no value in bitwarden secret")
|
||||||
|
secret.data[_secret_ref] = str(base64.b64encode(
|
||||||
|
value.encode("utf-8")), "utf-8")
|
||||||
return secret
|
return secret
|
||||||
|
|
||||||
|
|
||||||
@ -42,6 +47,9 @@ def create_managed_secret(spec, name, namespace, logger, body, **kwargs):
|
|||||||
id = spec.get('id')
|
id = spec.get('id')
|
||||||
secret_name = spec.get('name')
|
secret_name = spec.get('name')
|
||||||
secret_namespace = spec.get('namespace')
|
secret_namespace = spec.get('namespace')
|
||||||
|
labels = spec.get('labels')
|
||||||
|
custom_annotations = spec.get('annotations')
|
||||||
|
custom_secret_type = spec.get('secretType')
|
||||||
|
|
||||||
unlock_bw(logger)
|
unlock_bw(logger)
|
||||||
logger.info(f"Locking up secret with ID: {id}")
|
logger.info(f"Locking up secret with ID: {id}")
|
||||||
@ -53,12 +61,28 @@ def create_managed_secret(spec, name, namespace, logger, body, **kwargs):
|
|||||||
"managed": "bitwarden-secret.lerentis.uploadfilter24.eu",
|
"managed": "bitwarden-secret.lerentis.uploadfilter24.eu",
|
||||||
"managedObject": f"{namespace}/{name}"
|
"managedObject": f"{namespace}/{name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if custom_annotations:
|
||||||
|
annotations.update(custom_annotations)
|
||||||
|
|
||||||
|
if not custom_secret_type:
|
||||||
|
custom_secret_type = 'Opaque'
|
||||||
|
|
||||||
|
if not labels:
|
||||||
|
labels = {}
|
||||||
|
|
||||||
secret = kubernetes.client.V1Secret()
|
secret = kubernetes.client.V1Secret()
|
||||||
secret.metadata = kubernetes.client.V1ObjectMeta(
|
secret.metadata = kubernetes.client.V1ObjectMeta(
|
||||||
name=secret_name, annotations=annotations)
|
name=secret_name, annotations=annotations, labels=labels)
|
||||||
secret = create_kv(secret, secret_json_object, content_def)
|
secret.type = custom_secret_type
|
||||||
|
secret = create_kv(logger, id, secret, secret_json_object, content_def)
|
||||||
|
|
||||||
obj = api.create_namespaced_secret(
|
# Garbage collection will delete the generated secret if the owner
|
||||||
|
# Is not in the same namespace as the generated secret
|
||||||
|
if secret_namespace == namespace:
|
||||||
|
kopf.append_owner_reference(secret)
|
||||||
|
|
||||||
|
api.create_namespaced_secret(
|
||||||
namespace="{}".format(secret_namespace),
|
namespace="{}".format(secret_namespace),
|
||||||
body=secret
|
body=secret
|
||||||
)
|
)
|
||||||
@ -67,7 +91,7 @@ def create_managed_secret(spec, name, namespace, logger, body, **kwargs):
|
|||||||
|
|
||||||
|
|
||||||
@kopf.on.update('bitwarden-secret.lerentis.uploadfilter24.eu')
|
@kopf.on.update('bitwarden-secret.lerentis.uploadfilter24.eu')
|
||||||
@kopf.timer('bitwarden-secret.lerentis.uploadfilter24.eu', interval=900)
|
@kopf.timer('bitwarden-secret.lerentis.uploadfilter24.eu', interval=bw_sync_interval)
|
||||||
def update_managed_secret(
|
def update_managed_secret(
|
||||||
spec,
|
spec,
|
||||||
status,
|
status,
|
||||||
@ -82,19 +106,30 @@ def update_managed_secret(
|
|||||||
old_config = None
|
old_config = None
|
||||||
old_secret_name = None
|
old_secret_name = None
|
||||||
old_secret_namespace = None
|
old_secret_namespace = None
|
||||||
|
old_secret_type = None
|
||||||
if 'kopf.zalando.org/last-handled-configuration' in body.metadata.annotations:
|
if 'kopf.zalando.org/last-handled-configuration' in body.metadata.annotations:
|
||||||
old_config = json.loads(
|
old_config = json.loads(
|
||||||
body.metadata.annotations['kopf.zalando.org/last-handled-configuration'])
|
body.metadata.annotations['kopf.zalando.org/last-handled-configuration'])
|
||||||
old_secret_name = old_config['spec'].get('name')
|
old_secret_name = old_config['spec'].get('name')
|
||||||
old_secret_namespace = old_config['spec'].get('namespace')
|
old_secret_namespace = old_config['spec'].get('namespace')
|
||||||
|
old_secret_type = old_config['spec'].get('secretType')
|
||||||
secret_name = spec.get('name')
|
secret_name = spec.get('name')
|
||||||
secret_namespace = spec.get('namespace')
|
secret_namespace = spec.get('namespace')
|
||||||
|
labels = spec.get('labels')
|
||||||
|
custom_annotations = spec.get('annotations')
|
||||||
|
custom_secret_type = spec.get('secretType')
|
||||||
|
|
||||||
|
if not custom_secret_type:
|
||||||
|
custom_secret_type = 'Opaque'
|
||||||
|
|
||||||
|
if not old_secret_type:
|
||||||
|
old_secret_type = 'Opaque'
|
||||||
|
|
||||||
if old_config is not None and (
|
if old_config is not None and (
|
||||||
old_secret_name != secret_name or old_secret_namespace != secret_namespace):
|
old_secret_name != secret_name or old_secret_namespace != secret_namespace or old_secret_type != custom_secret_type):
|
||||||
# If the name of the secret or the namespace of the secret is different
|
# If the name of the secret or the namespace of the secret is different
|
||||||
# We have to delete the secret an recreate it
|
# We have to delete the secret an recreate it
|
||||||
logger.info("Secret name or namespace changed, let's recreate it")
|
logger.info("Secret name, namespace or type changed, let's recreate it")
|
||||||
delete_managed_secret(
|
delete_managed_secret(
|
||||||
old_config['spec'],
|
old_config['spec'],
|
||||||
name,
|
name,
|
||||||
@ -115,21 +150,36 @@ def update_managed_secret(
|
|||||||
"managedObject": f"{namespace}/{name}"
|
"managedObject": f"{namespace}/{name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if custom_annotations:
|
||||||
|
annotations.update(custom_annotations)
|
||||||
|
|
||||||
|
if not labels:
|
||||||
|
labels = {}
|
||||||
|
|
||||||
secret = kubernetes.client.V1Secret()
|
secret = kubernetes.client.V1Secret()
|
||||||
secret.metadata = kubernetes.client.V1ObjectMeta(
|
secret.metadata = kubernetes.client.V1ObjectMeta(
|
||||||
name=secret_name, annotations=annotations)
|
name=secret_name, annotations=annotations, labels=labels)
|
||||||
secret = create_kv(secret, secret_json_object, content_def)
|
secret.type = custom_secret_type
|
||||||
|
secret = create_kv(logger, id, secret, secret_json_object, content_def)
|
||||||
|
|
||||||
|
# Garbage collection will delete the generated secret if the owner
|
||||||
|
# Is not in the same namespace as the generated secret
|
||||||
|
if secret_namespace == namespace:
|
||||||
|
kopf.append_owner_reference(secret)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
obj = api.replace_namespaced_secret(
|
api.replace_namespaced_secret(
|
||||||
name=secret_name,
|
name=secret_name,
|
||||||
body=secret,
|
body=secret,
|
||||||
namespace="{}".format(secret_namespace))
|
namespace="{}".format(secret_namespace))
|
||||||
logger.info(
|
logger.info(
|
||||||
f"Secret {secret_namespace}/{secret_name} has been updated")
|
f"Secret {secret_namespace}/{secret_name} has been updated")
|
||||||
except BaseException:
|
except BaseException as e:
|
||||||
logger.warn(
|
logger.warn(
|
||||||
f"Could not update secret {secret_namespace}/{secret_name}!")
|
f"Could not update secret {secret_namespace}/{secret_name}!")
|
||||||
|
logger.warn(
|
||||||
|
f"Exception: {e}"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@kopf.on.delete('bitwarden-secret.lerentis.uploadfilter24.eu')
|
@kopf.on.delete('bitwarden-secret.lerentis.uploadfilter24.eu')
|
||||||
|
@ -1,10 +1,15 @@
|
|||||||
import json
|
from utils.utils import get_secret_from_bitwarden, get_attachment, parse_fields_scope, parse_login_scope
|
||||||
|
|
||||||
from utils.utils import get_secret_from_bitwarden, parse_fields_scope, parse_login_scope
|
|
||||||
|
|
||||||
|
|
||||||
def bitwarden_lookup(id, scope, field):
|
class BitwardenLookupHandler:
|
||||||
_secret_json = get_secret_from_bitwarden(None, id)
|
|
||||||
|
def __init__(self, logger) -> None:
|
||||||
|
self.logger = logger
|
||||||
|
|
||||||
|
def bitwarden_lookup(self, id, scope, field):
|
||||||
|
if scope == "attachment":
|
||||||
|
return get_attachment(self.logger, id, field)
|
||||||
|
_secret_json = get_secret_from_bitwarden(self.logger, id)
|
||||||
if scope == "login":
|
if scope == "login":
|
||||||
return parse_login_scope(_secret_json, field)
|
return parse_login_scope(_secret_json, field)
|
||||||
if scope == "fields":
|
if scope == "fields":
|
||||||
|
250
src/template.py
250
src/template.py
@ -3,39 +3,54 @@ import base64
|
|||||||
import kubernetes
|
import kubernetes
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from utils.utils import unlock_bw
|
from utils.utils import unlock_bw, bw_sync_interval
|
||||||
from lookups.bitwarden_lookup import bitwarden_lookup
|
from lookups.bitwarden_lookup import BitwardenLookupHandler
|
||||||
from jinja2 import Environment, BaseLoader
|
from jinja2 import Environment, BaseLoader
|
||||||
|
|
||||||
|
|
||||||
lookup_func_dict = {
|
def render_template(logger, template):
|
||||||
"bitwarden_lookup": bitwarden_lookup,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def render_template(template):
|
|
||||||
jinja_template = Environment(loader=BaseLoader()).from_string(template)
|
jinja_template = Environment(loader=BaseLoader()).from_string(template)
|
||||||
jinja_template.globals.update(lookup_func_dict)
|
jinja_template.globals.update({
|
||||||
|
"bitwarden_lookup": BitwardenLookupHandler(logger).bitwarden_lookup,
|
||||||
|
})
|
||||||
return jinja_template.render()
|
return jinja_template.render()
|
||||||
|
|
||||||
|
|
||||||
def create_template_secret(secret, filename, template):
|
def create_template_secret(logger, secret, filename, template):
|
||||||
secret.type = "Opaque"
|
|
||||||
secret.data = {}
|
secret.data = {}
|
||||||
secret.data[filename] = str(
|
secret.data[filename] = str(
|
||||||
base64.b64encode(
|
base64.b64encode(
|
||||||
render_template(template).encode("utf-8")),
|
render_template(logger, template).encode("utf-8")),
|
||||||
|
"utf-8")
|
||||||
|
return secret
|
||||||
|
|
||||||
|
def create_template_obj(logger, secret, content_def):
|
||||||
|
secret.data = {}
|
||||||
|
for eleml in content_def:
|
||||||
|
for k, elem in eleml.items():
|
||||||
|
for key, value in elem.items():
|
||||||
|
if key == "filename":
|
||||||
|
_file_name = value
|
||||||
|
if key == "template":
|
||||||
|
_template = value
|
||||||
|
secret.data[_file_name] = str(
|
||||||
|
base64.b64encode(
|
||||||
|
render_template(logger, _template).encode("utf-8")),
|
||||||
"utf-8")
|
"utf-8")
|
||||||
return secret
|
return secret
|
||||||
|
|
||||||
|
|
||||||
@kopf.on.create('bitwarden-template.lerentis.uploadfilter24.eu')
|
@kopf.on.create('bitwarden-template.lerentis.uploadfilter24.eu')
|
||||||
def create_managed_secret(spec, name, namespace, logger, body, **kwargs):
|
def create_managed_secret(spec, name, namespace, logger, body, **kwargs):
|
||||||
|
|
||||||
template = spec.get('template')
|
template = spec.get('template')
|
||||||
filename = spec.get('filename')
|
if template is not None:
|
||||||
|
create_beta7_secret(spec, name, namespace, logger, body, **kwargs)
|
||||||
secret_name = spec.get('name')
|
secret_name = spec.get('name')
|
||||||
secret_namespace = spec.get('namespace')
|
secret_namespace = spec.get('namespace')
|
||||||
|
custom_secret_type = spec.get('secretType')
|
||||||
|
labels = spec.get('labels')
|
||||||
|
custom_annotations = spec.get('annotations')
|
||||||
|
content_def = spec.get('content')
|
||||||
|
|
||||||
unlock_bw(logger)
|
unlock_bw(logger)
|
||||||
|
|
||||||
@ -45,21 +60,81 @@ def create_managed_secret(spec, name, namespace, logger, body, **kwargs):
|
|||||||
"managed": "bitwarden-template.lerentis.uploadfilter24.eu",
|
"managed": "bitwarden-template.lerentis.uploadfilter24.eu",
|
||||||
"managedObject": f"{namespace}/{name}"
|
"managedObject": f"{namespace}/{name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if custom_annotations:
|
||||||
|
annotations.update(custom_annotations)
|
||||||
|
|
||||||
|
if not custom_secret_type:
|
||||||
|
custom_secret_type = 'Opaque'
|
||||||
|
|
||||||
|
if not labels:
|
||||||
|
labels = {}
|
||||||
|
|
||||||
secret = kubernetes.client.V1Secret()
|
secret = kubernetes.client.V1Secret()
|
||||||
secret.metadata = kubernetes.client.V1ObjectMeta(
|
secret.metadata = kubernetes.client.V1ObjectMeta(
|
||||||
name=secret_name, annotations=annotations)
|
name=secret_name, annotations=annotations, labels=labels)
|
||||||
secret = create_template_secret(secret, filename, template)
|
secret.type = custom_secret_type
|
||||||
|
secret = create_template_obj(logger, secret, content_def)
|
||||||
|
|
||||||
obj = api.create_namespaced_secret(
|
# Garbage collection will delete the generated secret if the owner
|
||||||
secret_namespace, secret
|
# Is not in the same namespace as the generated secret
|
||||||
|
if secret_namespace == namespace:
|
||||||
|
kopf.append_owner_reference(secret)
|
||||||
|
|
||||||
|
api.create_namespaced_secret(
|
||||||
|
namespace="{}".format(secret_namespace),
|
||||||
|
body=secret
|
||||||
)
|
)
|
||||||
|
|
||||||
logger.info(f"Secret {secret_namespace}/{secret_name} has been created")
|
logger.info(f"Secret {secret_namespace}/{secret_name} has been created")
|
||||||
|
|
||||||
|
|
||||||
@kopf.on.update('bitwarden-template.lerentis.uploadfilter24.eu')
|
def create_beta7_secret(spec, name, namespace, logger, body, **kwargs):
|
||||||
@kopf.timer('bitwarden-template.lerentis.uploadfilter24.eu', interval=900)
|
|
||||||
def update_managed_secret(
|
template = spec.get('template')
|
||||||
|
filename = spec.get('filename')
|
||||||
|
secret_name = spec.get('name')
|
||||||
|
secret_namespace = spec.get('namespace')
|
||||||
|
labels = spec.get('labels')
|
||||||
|
custom_annotations = spec.get('annotations')
|
||||||
|
custom_secret_type = spec.get('secretType')
|
||||||
|
|
||||||
|
unlock_bw(logger)
|
||||||
|
|
||||||
|
api = kubernetes.client.CoreV1Api()
|
||||||
|
|
||||||
|
annotations = {
|
||||||
|
"managed": "bitwarden-template.lerentis.uploadfilter24.eu",
|
||||||
|
"managedObject": f"{namespace}/{name}"
|
||||||
|
}
|
||||||
|
|
||||||
|
if custom_annotations:
|
||||||
|
annotations.update(custom_annotations)
|
||||||
|
|
||||||
|
if not custom_secret_type:
|
||||||
|
custom_secret_type = 'Opaque'
|
||||||
|
|
||||||
|
if not labels:
|
||||||
|
labels = {}
|
||||||
|
|
||||||
|
secret = kubernetes.client.V1Secret()
|
||||||
|
secret.metadata = kubernetes.client.V1ObjectMeta(
|
||||||
|
name=secret_name, annotations=annotations, labels=labels)
|
||||||
|
secret.type = custom_secret_type
|
||||||
|
secret = create_template_secret(logger, secret, filename, template)
|
||||||
|
|
||||||
|
# Garbage collection will delete the generated secret if the owner
|
||||||
|
# Is not in the same namespace as the generated secret
|
||||||
|
if secret_namespace == namespace:
|
||||||
|
kopf.append_owner_reference(secret)
|
||||||
|
|
||||||
|
api.create_namespaced_secret(
|
||||||
|
secret_namespace, secret
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.info(f"Secret {secret_namespace}/{secret_name} has been created")
|
||||||
|
|
||||||
|
def update_beta7_secret(
|
||||||
spec,
|
spec,
|
||||||
status,
|
status,
|
||||||
name,
|
name,
|
||||||
@ -72,20 +147,31 @@ def update_managed_secret(
|
|||||||
filename = spec.get('filename')
|
filename = spec.get('filename')
|
||||||
secret_name = spec.get('name')
|
secret_name = spec.get('name')
|
||||||
secret_namespace = spec.get('namespace')
|
secret_namespace = spec.get('namespace')
|
||||||
|
labels = spec.get('labels')
|
||||||
|
custom_annotations = spec.get('annotations')
|
||||||
|
custom_secret_type = spec.get('secretType')
|
||||||
|
|
||||||
|
if not custom_secret_type:
|
||||||
|
custom_secret_type = 'Opaque'
|
||||||
|
|
||||||
old_config = None
|
old_config = None
|
||||||
old_secret_name = None
|
old_secret_name = None
|
||||||
old_secret_namespace = None
|
old_secret_namespace = None
|
||||||
|
old_secret_type = None
|
||||||
if 'kopf.zalando.org/last-handled-configuration' in body.metadata.annotations:
|
if 'kopf.zalando.org/last-handled-configuration' in body.metadata.annotations:
|
||||||
old_config = json.loads(
|
old_config = json.loads(
|
||||||
body.metadata.annotations['kopf.zalando.org/last-handled-configuration'])
|
body.metadata.annotations['kopf.zalando.org/last-handled-configuration'])
|
||||||
old_secret_name = old_config['spec'].get('name')
|
old_secret_name = old_config['spec'].get('name')
|
||||||
old_secret_namespace = old_config['spec'].get('namespace')
|
old_secret_namespace = old_config['spec'].get('namespace')
|
||||||
|
old_secret_type = old_config['spec'].get('secretType')
|
||||||
secret_name = spec.get('name')
|
secret_name = spec.get('name')
|
||||||
secret_namespace = spec.get('namespace')
|
secret_namespace = spec.get('namespace')
|
||||||
|
|
||||||
|
if not old_secret_type:
|
||||||
|
old_secret_type = 'Opaque'
|
||||||
|
|
||||||
if old_config is not None and (
|
if old_config is not None and (
|
||||||
old_secret_name != secret_name or old_secret_namespace != secret_namespace):
|
old_secret_name != secret_name or old_secret_namespace != secret_namespace or old_secret_type != custom_secret_type):
|
||||||
# If the name of the secret or the namespace of the secret is different
|
# If the name of the secret or the namespace of the secret is different
|
||||||
# We have to delete the secret an recreate it
|
# We have to delete the secret an recreate it
|
||||||
logger.info("Secret name or namespace changed, let's recreate it")
|
logger.info("Secret name or namespace changed, let's recreate it")
|
||||||
@ -106,21 +192,133 @@ def update_managed_secret(
|
|||||||
"managed": "bitwarden-template.lerentis.uploadfilter24.eu",
|
"managed": "bitwarden-template.lerentis.uploadfilter24.eu",
|
||||||
"managedObject": f"{namespace}/{name}"
|
"managedObject": f"{namespace}/{name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if custom_annotations:
|
||||||
|
annotations.update(custom_annotations)
|
||||||
|
|
||||||
|
if not labels:
|
||||||
|
labels = {}
|
||||||
|
|
||||||
secret = kubernetes.client.V1Secret()
|
secret = kubernetes.client.V1Secret()
|
||||||
secret.metadata = kubernetes.client.V1ObjectMeta(
|
secret.metadata = kubernetes.client.V1ObjectMeta(
|
||||||
name=secret_name, annotations=annotations)
|
name=secret_name, annotations=annotations, labels=labels)
|
||||||
secret = create_template_secret(secret, filename, template)
|
secret.type = custom_secret_type
|
||||||
|
secret = create_template_secret(logger, secret, filename, template)
|
||||||
|
|
||||||
|
# Garbage collection will delete the generated secret if the owner
|
||||||
|
# Is not in the same namespace as the generated secret
|
||||||
|
if secret_namespace == namespace:
|
||||||
|
kopf.append_owner_reference(secret)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
obj = api.replace_namespaced_secret(
|
api.replace_namespaced_secret(
|
||||||
name=secret_name,
|
name=secret_name,
|
||||||
body=secret,
|
body=secret,
|
||||||
namespace="{}".format(secret_namespace))
|
namespace="{}".format(secret_namespace))
|
||||||
logger.info(
|
logger.info(
|
||||||
f"Secret {secret_namespace}/{secret_name} has been updated")
|
f"Secret {secret_namespace}/{secret_name} has been updated")
|
||||||
except BaseException:
|
except BaseException as e:
|
||||||
logger.warn(
|
logger.warn(
|
||||||
f"Could not update secret {secret_namespace}/{secret_name}!")
|
f"Could not update secret {secret_namespace}/{secret_name}!")
|
||||||
|
logger.warn(
|
||||||
|
f"Exception: {e}"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@kopf.on.update('bitwarden-template.lerentis.uploadfilter24.eu')
|
||||||
|
@kopf.timer('bitwarden-template.lerentis.uploadfilter24.eu', interval=bw_sync_interval)
|
||||||
|
def update_managed_secret(
|
||||||
|
spec,
|
||||||
|
status,
|
||||||
|
name,
|
||||||
|
namespace,
|
||||||
|
logger,
|
||||||
|
body,
|
||||||
|
**kwargs):
|
||||||
|
|
||||||
|
template = spec.get('template')
|
||||||
|
if template is not None:
|
||||||
|
update_beta7_secret(spec, status, name, namespace, logger, body, **kwargs)
|
||||||
|
secret_name = spec.get('name')
|
||||||
|
secret_namespace = spec.get('namespace')
|
||||||
|
labels = spec.get('labels')
|
||||||
|
custom_annotations = spec.get('annotations')
|
||||||
|
custom_secret_type = spec.get('secretType')
|
||||||
|
content_def = spec.get('content')
|
||||||
|
|
||||||
|
if not custom_secret_type:
|
||||||
|
custom_secret_type = 'Opaque'
|
||||||
|
|
||||||
|
old_config = None
|
||||||
|
old_secret_name = None
|
||||||
|
old_secret_namespace = None
|
||||||
|
old_secret_type = 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')
|
||||||
|
old_secret_type = old_config['spec'].get('secretType')
|
||||||
|
secret_name = spec.get('name')
|
||||||
|
secret_namespace = spec.get('namespace')
|
||||||
|
|
||||||
|
if not old_secret_type:
|
||||||
|
old_secret_type = 'Opaque'
|
||||||
|
|
||||||
|
if old_config is not None and (
|
||||||
|
old_secret_name != secret_name or old_secret_namespace != secret_namespace or old_secret_type != custom_secret_type):
|
||||||
|
# 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()
|
||||||
|
|
||||||
|
annotations = {
|
||||||
|
"managed": "bitwarden-template.lerentis.uploadfilter24.eu",
|
||||||
|
"managedObject": f"{namespace}/{name}"
|
||||||
|
}
|
||||||
|
|
||||||
|
if custom_annotations:
|
||||||
|
annotations.update(custom_annotations)
|
||||||
|
|
||||||
|
if not labels:
|
||||||
|
labels = {}
|
||||||
|
|
||||||
|
secret = kubernetes.client.V1Secret()
|
||||||
|
secret.metadata = kubernetes.client.V1ObjectMeta(
|
||||||
|
name=secret_name, annotations=annotations, labels=labels)
|
||||||
|
secret.type = custom_secret_type
|
||||||
|
secret = create_template_obj(logger, secret, content_def)
|
||||||
|
|
||||||
|
# Garbage collection will delete the generated secret if the owner
|
||||||
|
# Is not in the same namespace as the generated secret
|
||||||
|
if secret_namespace == namespace:
|
||||||
|
kopf.append_owner_reference(secret)
|
||||||
|
|
||||||
|
try:
|
||||||
|
api.replace_namespaced_secret(
|
||||||
|
name=secret_name,
|
||||||
|
body=secret,
|
||||||
|
namespace="{}".format(secret_namespace))
|
||||||
|
logger.info(
|
||||||
|
f"Secret {secret_namespace}/{secret_name} has been updated")
|
||||||
|
except BaseException as e:
|
||||||
|
logger.warn(
|
||||||
|
f"Could not update secret {secret_namespace}/{secret_name}!")
|
||||||
|
logger.warn(
|
||||||
|
f"Exception: {e}"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@kopf.on.delete('bitwarden-template.lerentis.uploadfilter24.eu')
|
@kopf.on.delete('bitwarden-template.lerentis.uploadfilter24.eu')
|
||||||
|
@ -1,16 +1,48 @@
|
|||||||
import os
|
import os
|
||||||
import json
|
import json
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import distutils
|
||||||
|
|
||||||
|
bw_sync_interval = float(os.environ.get(
|
||||||
|
'BW_SYNC_INTERVAL', 900))
|
||||||
|
|
||||||
class BitwardenCommandException(Exception):
|
class BitwardenCommandException(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
def get_secret_from_bitwarden(logger, id):
|
def get_secret_from_bitwarden(logger, id, force_sync=False):
|
||||||
|
sync_bw(logger, force=force_sync)
|
||||||
return command_wrapper(logger, command=f"get item {id}")
|
return command_wrapper(logger, command=f"get item {id}")
|
||||||
|
|
||||||
|
|
||||||
|
def sync_bw(logger, force=False):
|
||||||
|
|
||||||
|
def _sync(logger):
|
||||||
|
status_output = command_wrapper(logger, command=f"sync")
|
||||||
|
logger.info(f"Sync successful {status_output}")
|
||||||
|
return
|
||||||
|
|
||||||
|
if force:
|
||||||
|
_sync(logger)
|
||||||
|
return
|
||||||
|
|
||||||
|
global_force_sync = bool(distutils.util.strtobool(
|
||||||
|
os.environ.get('BW_FORCE_SYNC', "false")))
|
||||||
|
|
||||||
|
if global_force_sync:
|
||||||
|
logger.debug("Running forced sync")
|
||||||
|
status_output = _sync(logger)
|
||||||
|
logger.info(f"Sync successful {status_output}")
|
||||||
|
else:
|
||||||
|
logger.debug("Running scheduled sync")
|
||||||
|
status_output = _sync(logger)
|
||||||
|
logger.info(f"Sync successful {status_output}")
|
||||||
|
|
||||||
|
|
||||||
|
def get_attachment(logger, id, name):
|
||||||
|
return command_wrapper(logger, command=f"get attachment {name} --itemid {id}", raw=True)
|
||||||
|
|
||||||
|
|
||||||
def unlock_bw(logger):
|
def unlock_bw(logger):
|
||||||
status_output = command_wrapper(logger, "status", False)
|
status_output = command_wrapper(logger, "status", False)
|
||||||
status = status_output['data']['template']['status']
|
status = status_output['data']['template']['status']
|
||||||
@ -22,16 +54,22 @@ def unlock_bw(logger):
|
|||||||
logger.info("Signin successful. Session exported")
|
logger.info("Signin successful. Session exported")
|
||||||
|
|
||||||
|
|
||||||
def command_wrapper(logger, command, use_success: bool = True):
|
def command_wrapper(logger, command, use_success: bool = True, raw: bool = False):
|
||||||
system_env = dict(os.environ)
|
system_env = dict(os.environ)
|
||||||
|
response_flag = "--raw" if raw else "--response"
|
||||||
sp = subprocess.Popen(
|
sp = subprocess.Popen(
|
||||||
[f"bw --response {command}"],
|
[f"bw {response_flag} {command}"],
|
||||||
stdout=subprocess.PIPE,
|
stdout=subprocess.PIPE,
|
||||||
stderr=subprocess.PIPE,
|
stderr=subprocess.PIPE,
|
||||||
close_fds=True,
|
close_fds=True,
|
||||||
shell=True,
|
shell=True,
|
||||||
env=system_env)
|
env=system_env)
|
||||||
out, err = sp.communicate()
|
out, err = sp.communicate()
|
||||||
|
if err:
|
||||||
|
logger.warn(err)
|
||||||
|
return None
|
||||||
|
if raw:
|
||||||
|
return out.decode(encoding='UTF-8')
|
||||||
if "DEBUG" in system_env:
|
if "DEBUG" in system_env:
|
||||||
logger.info(out.decode(encoding='UTF-8'))
|
logger.info(out.decode(encoding='UTF-8'))
|
||||||
resp = json.loads(out.decode(encoding='UTF-8'))
|
resp = json.loads(out.decode(encoding='UTF-8'))
|
||||||
|
Loading…
Reference in New Issue
Block a user