Skip to content

feat: [CLI-51461]: implementing checks to allow upgrade to ES v1 API #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harness-jc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: [CLI-51461]: implementing checks to allow upgrade to ES v1 API #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/templates/_dbv3.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ REQUIRED:
{{- $localEnabled := dig "enabled" false $localDBCtx }}
{{- if and $localEnabled (eq (include "harnesscommon.secrets.hasESOSecrets" (dict "secretsCtx" $localDBCtx.secrets)) "true") }}
{{- $localDBESOSecretCtxIdentifier := include "harnesscommon.dbv3.esoSecretCtxIdentifier" (dict "ctx" $ "dbType" $dbType "scope" "local" "instanceName" $instanceName) }}
{{- include "harnesscommon.secrets.generateExternalSecret" (dict "secretsCtx" $localDBCtx.secrets "secretNamePrefix" $localDBESOSecretCtxIdentifier) }}
{{- include "harnesscommon.secrets.generateExternalSecret" (dict "ctx" $ "secretsCtx" $localDBCtx.secrets "secretNamePrefix" $localDBESOSecretCtxIdentifier) }}
{{- print "\n---" }}
{{- end }}
{{- end }}
Expand Down Expand Up @@ -511,7 +511,7 @@ REQUIRED:
{{- $localEnabled := dig "enabled" false $localDBCtx }}
{{- if and $localEnabled (eq (include "harnesscommon.secrets.hasESOSecrets" (dict "secretsCtx" $localDBCtx.secrets)) "true") }}
{{- $localDBESOSecretCtxIdentifier := include "harnesscommon.dbv3.esoSecretCtxIdentifier" (dict "ctx" $ "dbType" $dbType "scope" "local" "instanceName" $instanceName) }}
{{- include "harnesscommon.secrets.generateExternalSecret" (dict "secretsCtx" $localDBCtx.secrets "secretNamePrefix" $localDBESOSecretCtxIdentifier) }}
{{- include "harnesscommon.secrets.generateExternalSecret" (dict "ctx" $ "secretsCtx" $localDBCtx.secrets "secretNamePrefix" $localDBESOSecretCtxIdentifier) }}
{{- print "\n---" }}
{{- end }}
{{- end }}
Expand Down
15 changes: 15 additions & 0 deletions src/common/templates/_eso-secrets-helper.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,12 @@ USAGE:
{{/*
Generates ESO External Secret CRD

Automatically selects the appropriate API version:
- Uses external-secrets.io/v1 if available (ESO 0.16.2+)
- Falls back to external-secrets.io/v1beta1 if v1 is not available (pre-0.17.0)

Note: v1beta1 support was removed in ESO v0.17.0

USAGE:
{{ include "harnesscommon.secrets.generateExternalSecret" (dict "ctx" . "secretsCtx" .Values.secrets "secretIdentifier" "local") }}
*/}}
Expand All @@ -204,7 +210,16 @@ USAGE:
{{- if gt $esoSecretIdx 0 }}
{{ printf "\n---" }}
{{- end }}
{{- /* Detect which API version to use based on CRD availability */ -}}
{{- $useV1API := false }}
{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1/ExternalSecret" }}
{{- $useV1API = true }}
{{- end }}
{{- if $useV1API }}
apiVersion: external-secrets.io/v1
{{- else }}
apiVersion: external-secrets.io/v1beta1
{{- end }}
kind: ExternalSecret
metadata:
name: {{ $esoSecretName }}
Expand Down