From 869489c96548a1cb747234127224d79e685a6c96 Mon Sep 17 00:00:00 2001 From: Beraldo Leal Date: Wed, 17 Sep 2025 17:11:01 -0400 Subject: [PATCH] disabling ESO objects when backend: none When using backend=none, SNO is not used. Signed-off-by: Beraldo Leal --- charts/coco-supported/sandbox/templates/ssh-key-eso.yaml | 2 +- charts/hub/trustee/templates/kbs-operator-keys.yaml | 4 +++- charts/hub/trustee/templates/kbs-passphrase-eso.yaml | 4 +++- charts/hub/trustee/templates/kbsres1-eso.yaml | 4 +++- charts/hub/trustee/templates/securityPolicy-eso.yaml | 4 +++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/charts/coco-supported/sandbox/templates/ssh-key-eso.yaml b/charts/coco-supported/sandbox/templates/ssh-key-eso.yaml index 31898e1b..c9f41db2 100644 --- a/charts/coco-supported/sandbox/templates/ssh-key-eso.yaml +++ b/charts/coco-supported/sandbox/templates/ssh-key-eso.yaml @@ -1,4 +1,4 @@ -{{ if .Values.sandbox.azure }} +{{- if and (ne .Values.global.secretStore.backend "none") (.Values.sandbox.azure) }} --- apiVersion: "external-secrets.io/v1beta1" kind: ExternalSecret diff --git a/charts/hub/trustee/templates/kbs-operator-keys.yaml b/charts/hub/trustee/templates/kbs-operator-keys.yaml index 8122fb24..ca55e22b 100644 --- a/charts/hub/trustee/templates/kbs-operator-keys.yaml +++ b/charts/hub/trustee/templates/kbs-operator-keys.yaml @@ -1,3 +1,4 @@ +{{- if ne .Values.global.secretStore.backend "none" }} --- apiVersion: "external-secrets.io/v1beta1" kind: ExternalSecret @@ -18,4 +19,5 @@ spec: type: Opaque dataFrom: - extract: - key: {{ .Values.kbs.publicKey }} \ No newline at end of file + key: {{ .Values.kbs.publicKey }} +{{- end }} \ No newline at end of file diff --git a/charts/hub/trustee/templates/kbs-passphrase-eso.yaml b/charts/hub/trustee/templates/kbs-passphrase-eso.yaml index d6f55023..c6e116c3 100644 --- a/charts/hub/trustee/templates/kbs-passphrase-eso.yaml +++ b/charts/hub/trustee/templates/kbs-passphrase-eso.yaml @@ -1,3 +1,4 @@ +{{- if ne .Values.global.secretStore.backend "none" }} --- apiVersion: "external-secrets.io/v1beta1" kind: ExternalSecret @@ -18,4 +19,5 @@ spec: type: Opaque dataFrom: - extract: - key: {{ .Values.kbs.passphrase }} \ No newline at end of file + key: {{ .Values.kbs.passphrase }} +{{- end }} \ No newline at end of file diff --git a/charts/hub/trustee/templates/kbsres1-eso.yaml b/charts/hub/trustee/templates/kbsres1-eso.yaml index 94a0e092..21bb9e42 100644 --- a/charts/hub/trustee/templates/kbsres1-eso.yaml +++ b/charts/hub/trustee/templates/kbsres1-eso.yaml @@ -1,3 +1,4 @@ +{{- if ne .Values.global.secretStore.backend "none" }} --- apiVersion: "external-secrets.io/v1beta1" kind: ExternalSecret @@ -18,4 +19,5 @@ spec: type: Opaque dataFrom: - extract: - key: {{ .Values.kbs.kbsres1 }} \ No newline at end of file + key: {{ .Values.kbs.kbsres1 }} +{{- end }} \ No newline at end of file diff --git a/charts/hub/trustee/templates/securityPolicy-eso.yaml b/charts/hub/trustee/templates/securityPolicy-eso.yaml index 3358111a..ad3f0557 100644 --- a/charts/hub/trustee/templates/securityPolicy-eso.yaml +++ b/charts/hub/trustee/templates/securityPolicy-eso.yaml @@ -1,3 +1,4 @@ +{{- if ne .Values.global.secretStore.backend "none" }} --- apiVersion: "external-secrets.io/v1beta1" kind: ExternalSecret @@ -18,4 +19,5 @@ spec: type: generic dataFrom: - extract: - key: {{ .Values.kbs.securityPolicy }} \ No newline at end of file + key: {{ .Values.kbs.securityPolicy }} +{{- end }} \ No newline at end of file