Merge branch 'gitlab-fixy-wixy' into 'master'

Gitlab fixes for standalone runners

See merge request big-bang/bigbang!2737

chart/templates/gitlab/imagepullsecret.yaml

-{{- if or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled }}
+{{- if .Values.addons.gitlab.enabled }}
 {{- if ( include "imagePullSecret" . ) }}
 apiVersion: v1
 kind: Secret

chart/templates/gitlab/secret-ca.yaml

-{{- if and  (or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled) .Values.addons.gitlab.sso.enabled (or .Values.sso.certificate_authority (dig "certificateAuthority" "cert" false .Values.sso))}}
+{{- if and .Values.addons.gitlab.enabled .Values.addons.gitlab.sso.enabled (or .Values.sso.certificate_authority (dig "certificateAuthority" "cert" false .Values.sso))}}
 apiVersion: v1
 kind: Secret
 metadata:

chart/templates/gitlab/secret-database.yaml

-{{- if or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled }}
+{{- if .Values.addons.gitlab.enabled }}
 {{- if .Values.addons.gitlab.database.host }}
 apiVersion: v1
 kind: Secret

chart/templates/gitlab/secret-objectstore.yaml

-{{- if or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled }}
+{{- if .Values.addons.gitlab.enabled }}
 {{- if or .Values.addons.gitlab.objectStorage.region .Values.addons.gitlab.objectStorage.endpoint }}
 {{- if and (ne .Values.addons.gitlab.objectStorage.iamProfile "") (ne .Values.addons.gitlab.objectStorage.accessKey "") }}{{- fail "Must choose to use an IAM profile OR an AWS accessKey/accessSecret at .Values.addons.gitlab.objectStorage" }}{{- end }}
 apiVersion: v1

chart/templates/gitlab/secret-redis-bb.yaml

-{{- if and (ne .Values.addons.gitlab.redis.password "") (or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled) }}
+{{- if and (ne .Values.addons.gitlab.redis.password "") .Values.addons.gitlab.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:

chart/templates/gitlab/secret-sso.yaml

-{{- if or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled }}
+{{- if .Values.addons.gitlab.enabled }}
 {{- if .Values.addons.gitlab.sso.enabled }}
 # hostname is deprecated and replaced with domain. But if hostname exists then use it.
 {{- $domainName := default .Values.domain .Values.hostname }}