mirrors/external-secrets
1
0
Fork 0
mirror of https://github.com/external-secrets/external-secrets.git synced 2024-12-14 11:57:59 +00:00
Code Activity

fix(helm): remove git merge pointers (#3467)

Browse source 
The Helm function helper file contains a couple of merge pointers from #3420.

Signed-off-by: Gaston Festari <cilindrox@gmail.com>
This commit is contained in:
Gaston Festari 2024-05-10 04:56:42 -03:00 committed by GitHub
parent 0ee21e63fc
commit e7dc3a7cb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
deploy/charts/external-secrets/templates/_helpers.tpl
View file

@ -155,8 +155,6 @@ Determine the image to use, including if using a flavour.
{{- end }}
{{- end }}
<<<<<<< HEAD
{{/*
Renders a complete tree, even values that contains template.
*/}}
@ -167,8 +165,8 @@ Renders a complete tree, even values that contains template.
{{- tpl (.value | toYaml) .context }}
{{- end }}
{{- end -}}
=======
{{/*
{{/*
Return true if the OpenShift is the detected platform
Usage:
{{- include "external-secrets.isOpenShift" . -}}
@ -198,4 +196,3 @@ Render the securityContext based on the provided securityContext
{{- end -}}
{{- omit $adaptedContext "enabled" | toYaml -}}
{{- end -}}
>>>>>>> 2218c78b (Methods for managing securityContext and OpenShift support)