From d6c207ba82e2c22ad457d84b7699dc2c6601bb2a Mon Sep 17 00:00:00 2001 From: ttrabelsi Date: Fri, 27 Oct 2023 15:22:00 +0200 Subject: [PATCH] Fixed type and content of RegistryCredential --- charts/bitwarden-crd-operator/Chart.yaml | 10 +++++----- src/dockerlogin.py | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/charts/bitwarden-crd-operator/Chart.yaml b/charts/bitwarden-crd-operator/Chart.yaml index f779973..0698174 100644 --- a/charts/bitwarden-crd-operator/Chart.yaml +++ b/charts/bitwarden-crd-operator/Chart.yaml @@ -4,9 +4,9 @@ description: Deploy the Bitwarden CRD Operator type: application -version: "v0.10.0" +version: "v0.10.1" -appVersion: "0.9.0" +appVersion: "0.9.1" keywords: - operator @@ -95,8 +95,8 @@ annotations: artifacthub.io/operator: "true" artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/changes: | - - kind: added - description: "Added attachment lookup to bitwarden_lookup in BitwardenTemplate CRD" + - kind: fixed + description: "Fixed type and content of RegistryCredential" artifacthub.io/images: | - name: bitwarden-crd-operator - image: ghcr.io/lerentis/bitwarden-crd-operator:0.9.0 + image: ghcr.io/lerentis/bitwarden-crd-operator:0.9.1 diff --git a/src/dockerlogin.py b/src/dockerlogin.py index 24ceed8..880b991 100644 --- a/src/dockerlogin.py +++ b/src/dockerlogin.py @@ -13,7 +13,7 @@ def create_dockerlogin( username_ref, password_ref, registry): - secret.type = "dockerconfigjson" + secret.type = "kubernetes.io/dockerconfigjson" secret.data = {} auths_dict = {} registry_dict = {} @@ -26,7 +26,8 @@ def create_dockerlogin( base64.b64encode( f"{_username}:{_password}".encode("utf-8")), "utf-8") - + reg_auth_dict["username"] = _username + reg_auth_dict["password"] = _password reg_auth_dict["auth"] = cred_field registry_dict[registry] = reg_auth_dict auths_dict["auths"] = registry_dict