Commit d9c8cd7b authored by DJ Mountney's avatar DJ Mountney

Merge branch '1233-rename-subgroup-to-crd-prefix' into 'master'

Rename subgroup to CRD prefix

See merge request !773
parents 5e353714 2f636ec3
Pipeline #60075891 passed with stages
in 45 minutes and 34 seconds
......@@ -451,6 +451,7 @@ check_docs_internal_links:
--set minio.resources.requests.cpu=100m \
--set global.operator.enabled=true \
--set global.operator.bootstrap=${OPERATOR_BOOTSTRAP-false} \
--set gitlab.operator.crdPrefix="$CI_ENVIRONMENT_SLUG" \
--namespace="$KUBE_NAMESPACE" \
--version="$CI_PIPELINE_ID-$CI_JOB_ID" \
"$name" \
......
---
title: Rename subgroup to CRD prefix
merge_request: 773
author:
type: changed
{{- if and .Values.global.operator.enabled }}
{{- if .Values.global.operator.enabled }}
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
......
{{- if and .Values.global.operator.enabled }}
{{- if .Values.global.operator.enabled }}
apiVersion: v1
kind: ServiceAccount
metadata:
......
......@@ -28,8 +28,10 @@ spec:
env:
- name: GITLAB_CLASS
value: {{ .Release.Name }}
{{- if .Values.crdPrefix }}
- name: CRD_PREFIX
value: {{ .Release.Name }}
value: {{ .Values.crdPrefix }}
{{- end }}
{{ template "gitlab.imagePullPolicy" . }}
resources:
{{ toYaml .Values.resources | indent 12 }}
......
......@@ -31,3 +31,7 @@ resources:
requests:
cpu: 100m
memory: 64M
# A prefix for group name of GitLab CRD. It can be used for distinguishing
# different CRDs in a cluster, e.g. for development purposes such GitLab CI.
#crdPrefix:
\ No newline at end of file
......@@ -52,5 +52,9 @@ Returns the operator group name. A subgroup with the release name is chosen
*/}}
{{- define "gitlab.operator.groupName" -}}
{{ printf "%s.gitlab.com" .Release.Name }}
{{- if .Values.crdPrefix -}}
{{ printf "%s.gitlab.com" .Values.crdPrefix }}
{{- else -}}
gitlab.com
{{- end -}}
{{- end -}}
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