UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 4a971335 authored by Josh Wolf's avatar Josh Wolf
Browse files

fix: refactor gitlab.objectstorage to gitlab.objectStorage

parent fae7d61c
No related branches found
No related tags found
1 merge request!258Release 1.1
Hide whitespace changes
Inline Side-by-side
chart/templates/NOTES.txt
+ 14
− 14
View file @ 4a971335
...@@ -34,21 +34,21 @@ addons: ...@@ -34,21 +34,21 @@ addons:
accessSecret: mysecretkey accessSecret: mysecretkey
bucketPrefix: prod bucketPrefix: prod
{{ if $.Values.addons.gitlab.objectstorage.endpoint }} {{ if $.Values.addons.gitlab.objectStorage.endpoint }}
GITLAB: You have enabled Gitlab external object storage. GITLAB: You have enabled Gitlab external object storage.
Here is the list of buckets that you must provision in your s3 service: Here is the list of buckets that you must provision in your s3 service:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-registry {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-registry
{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-lfs {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-lfs
{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-artifacts {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-artifacts
{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-uploads {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-uploads
{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-packages {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-packages
{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-mr-diffs {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-mr-diffs
{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-terraform-state {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-terraform-state
{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-dependency-proxy {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-dependency-proxy
{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-pseudo {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-pseudo
{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-backup {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-backup
{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-backup-tmp {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-backup-tmp
{{- else }} {{- else }}
gitlab-registry gitlab-registry
gitlab-lfs gitlab-lfs
...@@ -72,7 +72,7 @@ PLATFORM ONE GITLAB WARNING: ...@@ -72,7 +72,7 @@ PLATFORM ONE GITLAB WARNING:
This option should only be used for development or CI pipelines. This option should only be used for development or CI pipelines.
{{- end -}} {{- end -}}
{{ if $.Values.addons.gitlab.objectstorage.endpoint }} {{ if $.Values.addons.gitlab.objectStorage.endpoint }}
{{ else }} {{ else }}
PLATFORM ONE GITLAB WARNING: PLATFORM ONE GITLAB WARNING:
You have enabled a MinIO internal service in the BigBang configuration. You have enabled a MinIO internal service in the BigBang configuration.
......
chart/templates/gitlab/helmrelease.yaml
+ 28
− 28
View file @ 4a971335
...@@ -52,13 +52,13 @@ spec: ...@@ -52,13 +52,13 @@ spec:
postgresql: postgresql:
install: false install: false
{{- end }} {{- end }}
{{- if .Values.addons.gitlab.objectstorage.endpoint }} {{- if .Values.addons.gitlab.objectStorage.endpoint }}
registry: registry:
storage: storage:
secret: gitlab-object-storage secret: gitlab-object-storage
key: registry key: registry
{{- end }} {{- end }}
{{- if .Values.addons.gitlab.objectstorage.endpoint }} {{- if .Values.addons.gitlab.objectStorage.endpoint }}
gitlab: gitlab:
task-runner: task-runner:
backups: backups:
...@@ -74,7 +74,7 @@ spec: ...@@ -74,7 +74,7 @@ spec:
name: {{ .Values.addons.gitlab.hostnames.gitlab }} name: {{ .Values.addons.gitlab.hostnames.gitlab }}
registry: registry:
name: {{ .Values.addons.gitlab.hostnames.registry }} name: {{ .Values.addons.gitlab.hostnames.registry }}
{{- if .Values.addons.gitlab.objectstorage.endpoint }} {{- if .Values.addons.gitlab.objectStorage.endpoint }}
minio: minio:
enabled: false enabled: false
{{- end }} {{- end }}
...@@ -88,15 +88,15 @@ spec: ...@@ -88,15 +88,15 @@ spec:
secret: gitlab-database secret: gitlab-database
key: PGPASSWORD key: PGPASSWORD
{{- end }} {{- end }}
{{- if .Values.addons.gitlab.objectstorage.endpoint }} {{- if .Values.addons.gitlab.objectStorage.endpoint }}
registry: registry:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-registry bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-registry
{{- else }} {{- else }}
bucket: gitlab-registry bucket: gitlab-registry
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if or .Values.addons.gitlab.sso.enabled .Values.addons.gitlab.objectstorage.endpoint }} {{- if or .Values.addons.gitlab.sso.enabled .Values.addons.gitlab.objectStorage.endpoint }}
appConfig: appConfig:
{{- end }} {{- end }}
{{- if .Values.addons.gitlab.sso.enabled }} {{- if .Values.addons.gitlab.sso.enabled }}
...@@ -119,10 +119,10 @@ spec: ...@@ -119,10 +119,10 @@ spec:
- secret: gitlab-sso-provider - secret: gitlab-sso-provider
key: gitlab-sso.json key: gitlab-sso.json
{{- end }} {{- end }}
{{- if .Values.addons.gitlab.objectstorage.endpoint }} {{- if .Values.addons.gitlab.objectStorage.endpoint }}
lfs: lfs:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-lfs bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-lfs
{{- else }} {{- else }}
bucket: gitlab-lfs bucket: gitlab-lfs
{{- end }} {{- end }}
...@@ -130,8 +130,8 @@ spec: ...@@ -130,8 +130,8 @@ spec:
secret: gitlab-object-storage secret: gitlab-object-storage
key: rails key: rails
artifacts: artifacts:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-artifacts bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-artifacts
{{- else }} {{- else }}
bucket: gitlab-artifacts bucket: gitlab-artifacts
{{- end }} {{- end }}
...@@ -139,8 +139,8 @@ spec: ...@@ -139,8 +139,8 @@ spec:
secret: gitlab-object-storage secret: gitlab-object-storage
key: rails key: rails
uploads: uploads:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-uploads bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-uploads
{{- else }} {{- else }}
bucket: gitlab-uploads bucket: gitlab-uploads
{{- end }} {{- end }}
...@@ -148,8 +148,8 @@ spec: ...@@ -148,8 +148,8 @@ spec:
secret: gitlab-object-storage secret: gitlab-object-storage
key: rails key: rails
packages: packages:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-packages bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-packages
{{- else }} {{- else }}
bucket: gitlab-packages bucket: gitlab-packages
{{- end }} {{- end }}
...@@ -157,8 +157,8 @@ spec: ...@@ -157,8 +157,8 @@ spec:
secret: gitlab-object-storage secret: gitlab-object-storage
key: rails key: rails
externalDiffs: externalDiffs:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-mr-diffs bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-mr-diffs
{{- else }} {{- else }}
bucket: gitlab-mr-diffs bucket: gitlab-mr-diffs
{{- end }} {{- end }}
...@@ -166,8 +166,8 @@ spec: ...@@ -166,8 +166,8 @@ spec:
secret: gitlab-object-storage secret: gitlab-object-storage
key: rails key: rails
terraformState: terraformState:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-terraform-state bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-terraform-state
{{- else }} {{- else }}
bucket: gitlab-terraform-state bucket: gitlab-terraform-state
{{- end }} {{- end }}
...@@ -175,8 +175,8 @@ spec: ...@@ -175,8 +175,8 @@ spec:
secret: gitlab-object-storage secret: gitlab-object-storage
key: rails key: rails
dependencyProxy: dependencyProxy:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-dependency-proxy bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-dependency-proxy
{{- else }} {{- else }}
bucket: gitlab-dependency-proxy bucket: gitlab-dependency-proxy
{{- end }} {{- end }}
...@@ -184,8 +184,8 @@ spec: ...@@ -184,8 +184,8 @@ spec:
secret: gitlab-object-storage secret: gitlab-object-storage
key: rails key: rails
pseudonymizer: pseudonymizer:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-pseudo bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-pseudo
{{- else }} {{- else }}
bucket: gitlab-pseudo bucket: gitlab-pseudo
{{- end }} {{- end }}
...@@ -193,13 +193,13 @@ spec: ...@@ -193,13 +193,13 @@ spec:
secret: gitlab-object-storage secret: gitlab-object-storage
key: rails key: rails
backups: backups:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-backup bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-backup
{{- else }} {{- else }}
bucket: gitlab-backup bucket: gitlab-backup
{{- end }} {{- end }}
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
tmpBucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-backup-tmp tmpBucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-backup-tmp
{{- else }} {{- else }}
tmpBucket: gitlab-backup-tmp tmpBucket: gitlab-backup-tmp
{{- end }} {{- end }}
......
chart/templates/gitlab/namespace.yaml
+ 20
− 20
View file @ 4a971335
...@@ -69,7 +69,7 @@ stringData: ...@@ -69,7 +69,7 @@ stringData:
{{- end }} {{- end }}
--- ---
# create object storage secret # create object storage secret
{{- if .Values.addons.gitlab.objectstorage.endpoint }} {{- if .Values.addons.gitlab.objectStorage.endpoint }}
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
...@@ -79,40 +79,40 @@ type: kubernetes.io/opaque ...@@ -79,40 +79,40 @@ type: kubernetes.io/opaque
stringData: stringData:
rails: |- rails: |-
provider: AWS provider: AWS
region: {{ .Values.addons.gitlab.objectstorage.region }} region: {{ .Values.addons.gitlab.objectStorage.region }}
aws_access_key_id: {{ .Values.addons.gitlab.objectstorage.accessKey }} aws_access_key_id: {{ .Values.addons.gitlab.objectStorage.accessKey }}
aws_secret_access_key: {{ .Values.addons.gitlab.objectstorage.accessSecret }} aws_secret_access_key: {{ .Values.addons.gitlab.objectStorage.accessSecret }}
{{- if eq .Values.addons.gitlab.objectstorage.type "minio" }} {{- if eq .Values.addons.gitlab.objectStorage.type "minio" }}
aws_signature_version: 4 aws_signature_version: 4
host: {{ regexReplaceAll "http(s{0,1})://(.*):(\\d+)" .Values.addons.gitlab.objectstorage.endpoint "${2}" }} host: {{ regexReplaceAll "http(s{0,1})://(.*):(\\d+)" .Values.addons.gitlab.objectStorage.endpoint "${2}" }}
endpoint: "{{ .Values.addons.gitlab.objectstorage.endpoint }}" endpoint: "{{ .Values.addons.gitlab.objectStorage.endpoint }}"
path_style: true path_style: true
{{- end }} {{- end }}
registry: |- registry: |-
s3: s3:
{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }} {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-registry bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-registry
{{- else }} {{- else }}
bucket: gitlab-registry bucket: gitlab-registry
{{- end }} {{- end }}
accesskey: {{ .Values.addons.gitlab.objectstorage.accessKey }} accesskey: {{ .Values.addons.gitlab.objectStorage.accessKey }}
secretkey: {{ .Values.addons.gitlab.objectstorage.accessSecret }} secretkey: {{ .Values.addons.gitlab.objectStorage.accessSecret }}
region: {{ .Values.addons.gitlab.objectstorage.region }} region: {{ .Values.addons.gitlab.objectStorage.region }}
{{- if eq .Values.addons.gitlab.objectstorage.type "s3" }} {{- if eq .Values.addons.gitlab.objectStorage.type "s3" }}
v4auth: true v4auth: true
{{- end }} {{- end }}
{{- if eq .Values.addons.gitlab.objectstorage.type "minio" }} {{- if eq .Values.addons.gitlab.objectStorage.type "minio" }}
aws_signature_version: 4 aws_signature_version: 4
host: {{ regexReplaceAll "http(s{0,1})://(.*):(\\d+)" .Values.addons.gitlab.objectstorage.endpoint "${2}" }} host: {{ regexReplaceAll "http(s{0,1})://(.*):(\\d+)" .Values.addons.gitlab.objectStorage.endpoint "${2}" }}
regionendpoint: "{{ .Values.addons.gitlab.objectstorage.endpoint }}" regionendpoint: "{{ .Values.addons.gitlab.objectStorage.endpoint }}"
path_style: true path_style: true
{{- end }} {{- end }}
backups: |- backups: |-
[default] [default]
access_key = {{ .Values.addons.gitlab.objectstorage.accessKey }} access_key = {{ .Values.addons.gitlab.objectStorage.accessKey }}
secret_key = {{ .Values.addons.gitlab.objectstorage.accessSecret }} secret_key = {{ .Values.addons.gitlab.objectStorage.accessSecret }}
bucket_location = {{ .Values.addons.gitlab.objectstorage.region }} bucket_location = {{ .Values.addons.gitlab.objectStorage.region }}
host_bucket = %(bucket)s.{{ regexReplaceAll "http(s*)://" .Values.addons.gitlab.objectstorage.endpoint "" }} host_bucket = %(bucket)s.{{ regexReplaceAll "http(s*)://" .Values.addons.gitlab.objectStorage.endpoint "" }}
{{- end }} {{- end }}
{{- end }} {{- end }}
\ No newline at end of file
chart/values.yaml
+ 4
− 4
View file @ 4a971335
...@@ -257,11 +257,11 @@ addons: ...@@ -257,11 +257,11 @@ addons:
# entering connection info will enable external database and will auto-create any required secrets. # entering connection info will enable external database and will auto-create any required secrets.
# Gitlab will not provison the database when using an external service # Gitlab will not provison the database when using an external service
host: "" # example: postgres.bigbang.dev host: "" # example: postgres.bigbang.dev
port: "" # example: 5432 port: 5432 # example: 5432
username: "" # example: gitlab
database: "" # example: gitlab database: "" # example: gitlab
username: "" # example: gitlab
password: "" # unencoded string data. This should be placed in the secret values and then encrypted password: "" # unencoded string data. This should be placed in the secret values and then encrypted
objectstorage: objectStorage:
# entering connection info will enable this option and will auto-create any required secrets # entering connection info will enable this option and will auto-create any required secrets
# Gitlab will not provision the S3 buckets when using an external service # Gitlab will not provision the S3 buckets when using an external service
type: "" # supported types are "s3" or "minio" type: "" # supported types are "s3" or "minio"
...@@ -269,7 +269,7 @@ addons: ...@@ -269,7 +269,7 @@ addons:
region: "" # example: us-gov-west-1 region: "" # example: us-gov-west-1
accessKey: "" # unencoded string data accessKey: "" # unencoded string data
accessSecret: "" # unencoded string data. This should be placed in the secret values and then encrypted accessSecret: "" # unencoded string data. This should be placed in the secret values and then encrypted
bucketPrefix: "" # optional. example: "prod" bucketPrefix: "" # optional, includes "-". example: "prod" becomes "prod-gitlab-backups"
values: {} values: {}
gitlabRunner: gitlabRunner:
......
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 - NO CUI