UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects

feat: upgrade gitlab to 13.7.2 and add new bigbang features

Merged kevin.wilder requested to merge bb-1287-2 into master
5 files
+ 335
91
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -48,8 +48,10 @@ spec:
enabled: {{ .Values.istio.enabled }}
monitoring:
enabled: {{ .Values.monitoring.enabled }}
{{- if ( include "imagePullSecret" . ) }}
## values for image pull secrets
{{- if .Values.addons.gitlab.database.host }}
postgresql:
install: false
{{- end }}
redis:
metrics:
image:
@@ -59,6 +61,11 @@ spec:
pullSecrets:
- private-registry
registry:
{{- if .Values.addons.gitlab.objectstorage.endpoint }}
storage:
secret: gitlab-object-storage
key: registry
{{- end }}
image:
pullSecrets:
- name: private-registry
@@ -69,6 +76,13 @@ spec:
- name: private-registry
gitlab:
task-runner:
{{- if .Values.addons.gitlab.objectstorage.endpoint }}
backups:
objectStorage:
config:
secret: gitlab-object-storage
key: backups
{{- end }}
image:
pullSecrets:
- name: private-registry
@@ -102,16 +116,143 @@ spec:
minio:
pullSecrets:
- name: private-registry
{{- end }}
global:
hosts:
domain: code.{{ .Values.hostname }}
domain: {{ .Values.hostname }}
gitlab:
name: code.{{ .Values.hostname }}
name: {{ .Values.addons.gitlab.hostnames.gitlab }}
registry:
name: registry.{{ .Values.hostname }}
{{- if ( include "imagePullSecret" . ) }}
## values for image pull secrets
name: {{ .Values.addons.gitlab.hostnames.registry }}
{{- if .Values.addons.gitlab.objectstorage.endpoint }}
minio:
enabled: false
{{- end }}
{{- if .Values.addons.gitlab.database.host }}
psql:
host: {{ .Values.addons.gitlab.database.host }}
port: {{ .Values.addons.gitlab.database.port }}
username: {{ .Values.addons.gitlab.database.username }}
database: {{ .Values.addons.gitlab.database.database }}
password:
secret: gitlab-database
key: PGPASSWORD
{{- end }}
{{- if .Values.addons.gitlab.objectstorage.endpoint }}
registry:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-registry
{{- else }}
bucket: gitlab-registry
{{- end }}
{{- end }}
{{- if or .Values.addons.gitlab.sso.enabled .Values.addons.gitlab.objectstorage.endpoint }}
appConfig:
{{- end }}
{{- if .Values.addons.gitlab.sso.enabled }}
omniauth:
enabled: true
{{- $global := .Values.addons.gitlab.values.global | default dict }}
{{- $appConfig := $global.appConfig | default dict }}
{{- $omniauth := $appConfig.omniauth | default dict }}
{{- if hasKey $omniauth "allowSingleSignOn" }}
allowSingleSignOn: {{ .Values.addons.gitlab.values.global.appConfig.omniauth.allowSingleSignOn }}
{{- else }}
allowSingleSignOn: ['openid_connect']
{{- end }}
{{- if hasKey $omniauth "blockAutoCreatedUsers" }}
blockAutoCreatedUsers: {{ .Values.addons.gitlab.values.global.appConfig.omniauth.blockAutoCreatedUsers }}
{{- else }}
blockAutoCreatedUsers: false
{{- end }}
providers:
- secret: gitlab-sso-provider
key: gitlab-sso.json
{{- end }}
{{- if .Values.addons.gitlab.objectstorage.endpoint }}
lfs:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-lfs
{{- else }}
bucket: gitlab-lfs
{{- end }}
connection:
secret: gitlab-object-storage
key: rails
artifacts:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-artifacts
{{- else }}
bucket: gitlab-artifacts
{{- end }}
connection:
secret: gitlab-object-storage
key: rails
uploads:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-uploads
{{- else }}
bucket: gitlab-uploads
{{- end }}
connection:
secret: gitlab-object-storage
key: rails
packages:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-packages
{{- else }}
bucket: gitlab-packages
{{- end }}
connection:
secret: gitlab-object-storage
key: rails
externalDiffs:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-mr-diffs
{{- else }}
bucket: gitlab-mr-diffs
{{- end }}
connection:
secret: gitlab-object-storage
key: rails
terraformState:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-terraform-state
{{- else }}
bucket: gitlab-terraform-state
{{- end }}
connection:
secret: gitlab-object-storage
key: rails
dependencyProxy:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-dependency-proxy
{{- else }}
bucket: gitlab-dependency-proxy
{{- end }}
connection:
secret: gitlab-object-storage
key: rails
pseudonymizer:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-pseudo
{{- else }}
bucket: gitlab-pseudo
{{- end }}
connection:
secret: gitlab-object-storage
key: rails
backups:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-backup
{{- else }}
bucket: gitlab-backup
{{- end }}
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
tmpBucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-backup-tmp
{{- else }}
tmpBucket: gitlab-backup-tmp
{{- end }}
{{- end }}
certificates:
image:
pullSecrets:
@@ -120,7 +261,6 @@ spec:
image:
pullSecrets:
- name: private-registry
{{ end }}
{{- if or .Values.gatekeeper.enabled .Values.istio.enabled .Values.monitoring.enabled }}
dependsOn:
Loading