UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 9d6736fc authored by Ryan Garcia's avatar Ryan Garcia :dizzy:
Browse files

Merge branch 'nowilburn-master-patch-89779' into 'master'

add support for Gitlab rails secret creation SKIP CHECK CHANGES SKIP UPGRADE

See merge request !2689
parents ce99cb4c d7630a12
No related branches found
No related tags found
1 merge request!2689add support for Gitlab rails secret creation SKIP CHECK CHANGES SKIP UPGRADE
Pipeline #1706415 passed
{{- if and (ne .Values.addons.gitlab.railsSecret "") .Values.addons.gitlab.enabled }}
apiVersion: v1
kind: Secret
metadata:
name: gitlab-rails-secret-bb
namespace: gitlab
type: Opaque
data:
secrets.yml: |
{{ .Values.addons.gitlab.railsSecret | nindent 4 | b64enc }}
{{- end }}
......@@ -452,6 +452,12 @@ global:
secret: "gitlab-smtp-password"
{{- end }}
{{- if .Values.addons.gitlab.railsSecret }}
railsSecret:
secret: "gitlab-rails-secret-bb"
{{- end }}
{{- if ne .Values.addons.gitlab.objectStorage.iamProfile "" }}
use_iam_profile: true
{{- end }}
......
......@@ -1187,6 +1187,11 @@ addons:
# with a random password.
# -- This needs to be set to a non-empty value in order for the Grafana Redis Datasource and Dashboards to be installed.
password: ""
# -- Rails plain text secret to define. If empty (""), the gitlab charts will create the gitlab-rails-secret with randomized data.
# Read the following for more information on setting Gitlab rails secrets: https://docs.gitlab.com/charts/installation/secrets#gitlab-rails-secret
railsSecret: ""
# -- Values to passthrough to the gitlab chart: https://repo1.dso.mil/big-bang/product/packages/gitlab.git
values: {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment