lerentis
/
bitwarden-crd-operator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 18 Wiki Activity

Merge pull request #49 from Lerentis/bugfix/tt/fix-registry-credential-type 

Fixed type and content of RegistryCredential
This commit is contained in:
Tobias Trabelsi 2023-10-27 15:29:18 +02:00 committed by GitHub
parent fc37a12737 d6c207ba82
commit 80d8db6924
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
charts/bitwarden-crd-operator/Chart.yaml
View File

@ -4,9 +4,9 @@ description: Deploy the Bitwarden CRD Operator
type: application type: application
version: "v0.10.0" version: "v0.10.1"
appVersion: "0.9.0" appVersion: "0.9.1"
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: added - kind: fixed
description: "Added attachment lookup to bitwarden_lookup in BitwardenTemplate CRD" description: "Fixed type and content of RegistryCredential"
artifacthub.io/images: | artifacthub.io/images: |
- name: bitwarden-crd-operator - name: bitwarden-crd-operator
image: ghcr.io/lerentis/bitwarden-crd-operator:0.9.0 image: ghcr.io/lerentis/bitwarden-crd-operator:0.9.1

5
src/dockerlogin.py
View File

@ -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