From 4a971335e4d3009117e1321e3147575d26d951b7 Mon Sep 17 00:00:00 2001
From: Josh Wolf <josh@joshwolf.dev>
Date: Wed, 17 Feb 2021 22:42:33 -0700
Subject: [PATCH] fix: refactor gitlab.objectstorage to gitlab.objectStorage
---
chart/templates/NOTES.txt | 28 ++++++-------
chart/templates/gitlab/helmrelease.yaml | 56 ++++++++++++-------------
chart/templates/gitlab/namespace.yaml | 40 +++++++++---------
chart/values.yaml | 8 ++--
4 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
index cb7e2bef67..37b494eecd 100644
--- a/chart/templates/NOTES.txt
+++ b/chart/templates/NOTES.txt
@@ -34,21 +34,21 @@ addons:
accessSecret: mysecretkey
bucketPrefix: prod
-{{ if $.Values.addons.gitlab.objectstorage.endpoint }}
+{{ if $.Values.addons.gitlab.objectStorage.endpoint }}
GITLAB: You have enabled Gitlab external object storage.
Here is the list of buckets that you must provision in your s3 service:
-{{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
-{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-registry
-{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-lfs
-{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-artifacts
-{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-uploads
-{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-packages
-{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-mr-diffs
-{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-terraform-state
-{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-dependency-proxy
-{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-pseudo
-{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-backup
-{{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-backup-tmp
+{{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
+{{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-registry
+{{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-lfs
+{{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-artifacts
+{{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-uploads
+{{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-packages
+{{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-mr-diffs
+{{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-terraform-state
+{{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-dependency-proxy
+{{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-pseudo
+{{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-backup
+{{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-backup-tmp
{{- else }}
gitlab-registry
gitlab-lfs
@@ -72,7 +72,7 @@ PLATFORM ONE GITLAB WARNING:
This option should only be used for development or CI pipelines.
{{- end -}}
-{{ if $.Values.addons.gitlab.objectstorage.endpoint }}
+{{ if $.Values.addons.gitlab.objectStorage.endpoint }}
{{ else }}
PLATFORM ONE GITLAB WARNING:
You have enabled a MinIO internal service in the BigBang configuration.
diff --git a/chart/templates/gitlab/helmrelease.yaml b/chart/templates/gitlab/helmrelease.yaml
index aad69c9d4b..b59e028243 100644
--- a/chart/templates/gitlab/helmrelease.yaml
+++ b/chart/templates/gitlab/helmrelease.yaml
@@ -52,13 +52,13 @@ spec:
postgresql:
install: false
{{- end }}
- {{- if .Values.addons.gitlab.objectstorage.endpoint }}
+ {{- if .Values.addons.gitlab.objectStorage.endpoint }}
registry:
storage:
secret: gitlab-object-storage
key: registry
{{- end }}
- {{- if .Values.addons.gitlab.objectstorage.endpoint }}
+ {{- if .Values.addons.gitlab.objectStorage.endpoint }}
gitlab:
task-runner:
backups:
@@ -74,7 +74,7 @@ spec:
name: {{ .Values.addons.gitlab.hostnames.gitlab }}
registry:
name: {{ .Values.addons.gitlab.hostnames.registry }}
- {{- if .Values.addons.gitlab.objectstorage.endpoint }}
+ {{- if .Values.addons.gitlab.objectStorage.endpoint }}
minio:
enabled: false
{{- end }}
@@ -88,15 +88,15 @@ spec:
secret: gitlab-database
key: PGPASSWORD
{{- end }}
- {{- if .Values.addons.gitlab.objectstorage.endpoint }}
+ {{- if .Values.addons.gitlab.objectStorage.endpoint }}
registry:
- {{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
- bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-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 }}
+ {{- if or .Values.addons.gitlab.sso.enabled .Values.addons.gitlab.objectStorage.endpoint }}
appConfig:
{{- end }}
{{- if .Values.addons.gitlab.sso.enabled }}
@@ -119,10 +119,10 @@ spec:
- secret: gitlab-sso-provider
key: gitlab-sso.json
{{- end }}
- {{- if .Values.addons.gitlab.objectstorage.endpoint }}
+ {{- if .Values.addons.gitlab.objectStorage.endpoint }}
lfs:
- {{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
- bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-lfs
+ {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
+ bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-lfs
{{- else }}
bucket: gitlab-lfs
{{- end }}
@@ -130,8 +130,8 @@ spec:
secret: gitlab-object-storage
key: rails
artifacts:
- {{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
- bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-artifacts
+ {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
+ bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-artifacts
{{- else }}
bucket: gitlab-artifacts
{{- end }}
@@ -139,8 +139,8 @@ spec:
secret: gitlab-object-storage
key: rails
uploads:
- {{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
- bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-uploads
+ {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
+ bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-uploads
{{- else }}
bucket: gitlab-uploads
{{- end }}
@@ -148,8 +148,8 @@ spec:
secret: gitlab-object-storage
key: rails
packages:
- {{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
- bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-packages
+ {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
+ bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-packages
{{- else }}
bucket: gitlab-packages
{{- end }}
@@ -157,8 +157,8 @@ spec:
secret: gitlab-object-storage
key: rails
externalDiffs:
- {{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
- bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-mr-diffs
+ {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
+ bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-mr-diffs
{{- else }}
bucket: gitlab-mr-diffs
{{- end }}
@@ -166,8 +166,8 @@ spec:
secret: gitlab-object-storage
key: rails
terraformState:
- {{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
- bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-terraform-state
+ {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
+ bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-terraform-state
{{- else }}
bucket: gitlab-terraform-state
{{- end }}
@@ -175,8 +175,8 @@ spec:
secret: gitlab-object-storage
key: rails
dependencyProxy:
- {{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
- bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-dependency-proxy
+ {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
+ bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-dependency-proxy
{{- else }}
bucket: gitlab-dependency-proxy
{{- end }}
@@ -184,8 +184,8 @@ spec:
secret: gitlab-object-storage
key: rails
pseudonymizer:
- {{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
- bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-pseudo
+ {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
+ bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-pseudo
{{- else }}
bucket: gitlab-pseudo
{{- end }}
@@ -193,13 +193,13 @@ spec:
secret: gitlab-object-storage
key: rails
backups:
- {{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
- bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-backup
+ {{- 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
+ {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
+ tmpBucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-backup-tmp
{{- else }}
tmpBucket: gitlab-backup-tmp
{{- end }}
diff --git a/chart/templates/gitlab/namespace.yaml b/chart/templates/gitlab/namespace.yaml
index 5203159cef..88b4398018 100644
--- a/chart/templates/gitlab/namespace.yaml
+++ b/chart/templates/gitlab/namespace.yaml
@@ -69,7 +69,7 @@ stringData:
{{- end }}
---
# create object storage secret
-{{- if .Values.addons.gitlab.objectstorage.endpoint }}
+{{- if .Values.addons.gitlab.objectStorage.endpoint }}
apiVersion: v1
kind: Secret
metadata:
@@ -79,40 +79,40 @@ type: kubernetes.io/opaque
stringData:
rails: |-
provider: AWS
- region: {{ .Values.addons.gitlab.objectstorage.region }}
- aws_access_key_id: {{ .Values.addons.gitlab.objectstorage.accessKey }}
- aws_secret_access_key: {{ .Values.addons.gitlab.objectstorage.accessSecret }}
- {{- if eq .Values.addons.gitlab.objectstorage.type "minio" }}
+ region: {{ .Values.addons.gitlab.objectStorage.region }}
+ aws_access_key_id: {{ .Values.addons.gitlab.objectStorage.accessKey }}
+ aws_secret_access_key: {{ .Values.addons.gitlab.objectStorage.accessSecret }}
+ {{- if eq .Values.addons.gitlab.objectStorage.type "minio" }}
aws_signature_version: 4
- host: {{ regexReplaceAll "http(s{0,1})://(.*):(\\d+)" .Values.addons.gitlab.objectstorage.endpoint "${2}" }}
- endpoint: "{{ .Values.addons.gitlab.objectstorage.endpoint }}"
+ host: {{ regexReplaceAll "http(s{0,1})://(.*):(\\d+)" .Values.addons.gitlab.objectStorage.endpoint "${2}" }}
+ endpoint: "{{ .Values.addons.gitlab.objectStorage.endpoint }}"
path_style: true
{{- end }}
registry: |-
s3:
- {{- if .Values.addons.gitlab.objectstorage.bucketPrefix }}
- bucket: {{ .Values.addons.gitlab.objectstorage.bucketPrefix }}-gitlab-registry
+ {{- if .Values.addons.gitlab.objectStorage.bucketPrefix }}
+ bucket: {{ .Values.addons.gitlab.objectStorage.bucketPrefix }}-gitlab-registry
{{- else }}
bucket: gitlab-registry
{{- end }}
- accesskey: {{ .Values.addons.gitlab.objectstorage.accessKey }}
- secretkey: {{ .Values.addons.gitlab.objectstorage.accessSecret }}
- region: {{ .Values.addons.gitlab.objectstorage.region }}
- {{- if eq .Values.addons.gitlab.objectstorage.type "s3" }}
+ accesskey: {{ .Values.addons.gitlab.objectStorage.accessKey }}
+ secretkey: {{ .Values.addons.gitlab.objectStorage.accessSecret }}
+ region: {{ .Values.addons.gitlab.objectStorage.region }}
+ {{- if eq .Values.addons.gitlab.objectStorage.type "s3" }}
v4auth: true
{{- end }}
- {{- if eq .Values.addons.gitlab.objectstorage.type "minio" }}
+ {{- if eq .Values.addons.gitlab.objectStorage.type "minio" }}
aws_signature_version: 4
- host: {{ regexReplaceAll "http(s{0,1})://(.*):(\\d+)" .Values.addons.gitlab.objectstorage.endpoint "${2}" }}
- regionendpoint: "{{ .Values.addons.gitlab.objectstorage.endpoint }}"
+ host: {{ regexReplaceAll "http(s{0,1})://(.*):(\\d+)" .Values.addons.gitlab.objectStorage.endpoint "${2}" }}
+ regionendpoint: "{{ .Values.addons.gitlab.objectStorage.endpoint }}"
path_style: true
{{- end }}
backups: |-
[default]
- access_key = {{ .Values.addons.gitlab.objectstorage.accessKey }}
- secret_key = {{ .Values.addons.gitlab.objectstorage.accessSecret }}
- bucket_location = {{ .Values.addons.gitlab.objectstorage.region }}
- host_bucket = %(bucket)s.{{ regexReplaceAll "http(s*)://" .Values.addons.gitlab.objectstorage.endpoint "" }}
+ access_key = {{ .Values.addons.gitlab.objectStorage.accessKey }}
+ secret_key = {{ .Values.addons.gitlab.objectStorage.accessSecret }}
+ bucket_location = {{ .Values.addons.gitlab.objectStorage.region }}
+ host_bucket = %(bucket)s.{{ regexReplaceAll "http(s*)://" .Values.addons.gitlab.objectStorage.endpoint "" }}
{{- end }}
{{- end }}
\ No newline at end of file
diff --git a/chart/values.yaml b/chart/values.yaml
index bb96fa73fa..d132280aaf 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -257,11 +257,11 @@ addons:
# 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
host: "" # example: postgres.bigbang.dev
- port: "" # example: 5432
- username: "" # example: gitlab
+ port: 5432 # example: 5432
database: "" # example: gitlab
+ username: "" # example: gitlab
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
# Gitlab will not provision the S3 buckets when using an external service
type: "" # supported types are "s3" or "minio"
@@ -269,7 +269,7 @@ addons:
region: "" # example: us-gov-west-1
accessKey: "" # unencoded string data
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: {}
gitlabRunner:
--
GitLab