UNCLASSIFIED

Skip to content

GitLab

Commit ae77c63a authored by bhearn7's avatar bhearn7
Browse files

update configmap conditional

parent b65ec397
Pipeline #439033 passed with stages
in 3 minutes and 29 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
chart/templates/engine_configmap.yaml
View file @ ae77c63a
...@@ -61,7 +61,7 @@ data: ...@@ -61,7 +61,7 @@ data:
keys: keys:
{{- $anchorefullname := include "anchore-engine.fullname" . -}} {{- $anchorefullname := include "anchore-engine.fullname" . -}}
{{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }} {{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }}
{{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret $old_secret }} {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret .Values.anchoreGlobal.oauthEnabled $old_secret }}
secret: ${ANCHORE_SAML_SECRET} secret: ${ANCHORE_SAML_SECRET}
{{- end }} {{- end }}
{{- with .Values.anchoreGlobal.saml.publicKeyName }} {{- with .Values.anchoreGlobal.saml.publicKeyName }}
......
chart/templates/enterprise_configmap.yaml
View file @ ae77c63a
...@@ -43,7 +43,7 @@ data: ...@@ -43,7 +43,7 @@ data:
keys: keys:
{{- $anchorefullname := include "anchore-engine.fullname" . -}} {{- $anchorefullname := include "anchore-engine.fullname" . -}}
{{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }} {{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }}
{{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret $old_secret }} {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret .Values.anchoreGlobal.oauthEnabled $old_secret }}
secret: ${ANCHORE_SAML_SECRET} secret: ${ANCHORE_SAML_SECRET}
{{- end }} {{- end }}
{{- with .Values.anchoreGlobal.saml.publicKeyName }} {{- with .Values.anchoreGlobal.saml.publicKeyName }}
......
chart/templates/enterprise_feeds_configmap.yaml
View file @ ae77c63a
...@@ -37,7 +37,7 @@ data: ...@@ -37,7 +37,7 @@ data:
keys: keys:
{{- $anchorefullname := include "anchore-engine.fullname" . -}} {{- $anchorefullname := include "anchore-engine.fullname" . -}}
{{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }} {{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }}
{{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret $old_secret }} {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret .Values.anchoreGlobal.oauthEnabled $old_secret }}
secret: ${ANCHORE_SAML_SECRET} secret: ${ANCHORE_SAML_SECRET}
{{- end }} {{- end }}
{{- with .Values.anchoreGlobal.saml.publicKeyName }} {{- with .Values.anchoreGlobal.saml.publicKeyName }}
......
docs/BBCHANGES.md
View file @ ae77c63a
...@@ -238,7 +238,7 @@ Additionally, `./chart/templates/engine_configmap.yaml`, `./chart/templates/ente ...@@ -238,7 +238,7 @@ Additionally, `./chart/templates/engine_configmap.yaml`, `./chart/templates/ente
keys: keys:
{{- $anchorefullname := include "anchore-engine.fullname" . -}} {{- $anchorefullname := include "anchore-engine.fullname" . -}}
{{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }} {{- $old_secret := lookup "v1" "Secret" .Release.Namespace $anchorefullname }}
{{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret $old_secret }} {{- if or .Values.anchoreGlobal.saml.secret .Values.anchoreGlobal.saml.useExistingSecret .Values.anchoreGlobal.oauthEnabled $old_secret }}
secret: ${ANCHORE_SAML_SECRET} secret: ${ANCHORE_SAML_SECRET}
{{- end }} {{- end }}
``` ```
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED