Merge branch 'bb-597' into 'master'

BB-597 - Gitlab-runner integration into Big Bang

See merge request platform-one/big-bang/bigbang!191

base/gitrepository.yaml

@@ -11,4 +11,4 @@ spec:
   interval: 10m
   url: https://repo1.dso.mil/platform-one/big-bang/umbrella.git
   ref:
-    tag: 1.0.7
\ No newline at end of file
+    tag: 1.0.7

chart/templates/gitlab-runner/gitlabRunner-helmrelease.yaml

+{{- if .Values.addons.gitlabRunner.enabled }}
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: gitlab-runner
+  namespace: {{ .Release.Namespace }}
+spec:
+  targetNamespace: gitlab
+  releaseName: gitlab-runner
+  chart:
+    spec:
+      chart: {{ .Values.addons.gitlabRunner.git.path }}
+      interval: 5m
+      sourceRef:
+        kind: GitRepository
+        name: gitlab-runner
+        namespace: {{ .Release.Namespace }}
+
+  {{- with .Values.flux }}
+  interval: {{ .interval }}
+  test:
+    enable: false
+  install:
+    remediation:
+      retries: {{ .install.retries }}
+  upgrade:
+    remediation:
+      retries: {{ .upgrade.retries }}
+      remediateLastFailure: true
+    cleanupOnFail: true
+  rollback:
+    timeout: {{ .rollback.timeout }}
+    cleanupOnFail: {{ .rollback.cleanupOnFail }}
+  {{- end }}
+
+  valuesFrom:
+  - name: values
+    kind: Secret
+    valuesKey: "gitlab-runner.yaml"
+
+  values:
+    imagePullSecrets:
+    - name: private-registry
+    runners:
+      imagePullSecrets:
+      - private-registry
+    monitoring:
+      enabled: {{ .Values.monitoring.enabled }}
+
+  {{- if or .Values.gatekeeper.enabled .Values.monitoring.enabled .Values.addons.gitlab.enabled }}
+  dependsOn:
+    {{- if .Values.gatekeeper.enabled }}
+    - name: gatekeeper
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
+    {{- if .Values.monitoring.enabled }}
+    - name: monitoring
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
+    {{- if .Values.addons.gitlab.enabled }}
+    - name: gitlab
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
+  {{- end }}
+{{- end }}
\ No newline at end of file

chart/templates/gitlab-runner/gitrepository.yaml

+{{- if and (not .Values.offline) .Values.addons.gitlabRunner.enabled }}
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: gitlab-runner
+  namespace: {{ .Release.Namespace }}
+spec:
+  interval: {{ .Values.flux.interval }}
+  url: {{ .Values.addons.gitlabRunner.git.repo }}
+  ref:
+    {{- include "validRef" .Values.addons.gitlabRunner.git | nindent 4 }}
+  {{ include "gitIgnore" . }}
+  {{- include "gitCreds" .Values.git | nindent 2 }}
+{{- end }}
\ No newline at end of file

chart/templates/monitoring/monitoring-helmrelease.yaml

@@ -79,7 +79,6 @@ spec:
     kube-state-metrics:
       imagePullSecrets:
       - name: private-registry
-
 {{- if .Values.monitoring.sso.enabled }}
     ingress:
       prometheus:

chart/templates/values.yaml

@@ -31,6 +31,8 @@ stringData:
 {{ toYaml .Values.istio.values | indent 4  }}
   gatekeeper.yaml: |
 {{ toYaml .Values.gatekeeper.values | indent 4 }}
+  gitlab-runner.yaml: |
+{{ toYaml .Values.addons.gitlabRunner.values | indent 4 }}
   fluentbit.yaml: |
 {{ toYaml .Values.fluentbit.values | indent 4 }}
   eckoperator.yaml: |

chart/values.yaml

@@ -249,6 +249,14 @@ addons:
       bucketPrefix: "" # optional. example: "prod"
     values: {}
 
+  gitlabRunner:
+    enabled: false
+    git:
+      repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab-runner.git
+      path: "./chart"
+      tag: "0.19.2-bb.2"
+    values: {}
+
   haproxy:
     enabled: false
     git: