Updated old configuration checks
This commit is contained in:
parent
e141888335
commit
5dde6160de
@ -6,7 +6,7 @@ type: application
|
||||
|
||||
version: "v0.13.0"
|
||||
|
||||
appVersion: "0.12.0"
|
||||
appVersion: "0.12.1"
|
||||
|
||||
keywords:
|
||||
- operator
|
||||
@ -117,4 +117,4 @@ annotations:
|
||||
description: "Allow custom type in templated secrets"
|
||||
artifacthub.io/images: |
|
||||
- name: bitwarden-crd-operator
|
||||
image: ghcr.io/lerentis/bitwarden-crd-operator:0.12.0
|
||||
image: ghcr.io/lerentis/bitwarden-crd-operator:0.12.1
|
||||
|
@ -112,7 +112,7 @@ def update_managed_secret(
|
||||
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('type')
|
||||
old_secret_type = old_config['spec'].get('secretType')
|
||||
secret_name = spec.get('name')
|
||||
secret_namespace = spec.get('namespace')
|
||||
labels = spec.get('labels')
|
||||
@ -122,6 +122,9 @@ def update_managed_secret(
|
||||
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 (
|
||||
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
|
||||
|
@ -103,10 +103,13 @@ def update_managed_secret(
|
||||
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('type')
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user