upgrade chart

2a254b6d · kevin.wilder · 4a7b3643 · 2a254b6d · 2a254b6d · 2a254b6d
Commit 2a254b6d authored 3 years ago by kevin.wilder
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [0.36.0-bb.0] - 2022-01-26
+### Changed
+- Update helm chart to v0.36.0 app version 14.6.0
+- upstream chart added support for metrics scraping.
+### Removed
+- Removed BigBang templates for Service and ServiceMonitor because upstream chart now provides them.
+
 ## [0.34.0-bb.1] - 2022-01-11
 ### Fixed
 - Fix cypress run script

--- a/MODIFICATIONS.md
+++ b/MODIFICATIONS.md
@@ -18,9 +18,8 @@
 - set resources limits
 - set BigBang additional values monitoring.enabled: false

-## chart/templates/bigbang/*
- add template for service
- add templated for servicemonitor
+## chart/templates/deployment.yaml
+- remove /usr/bin/dumb-init line 89. That path does not exist in IronBank hardened image

 ## chart/.gitignore
 - comment ```charts/*``` need to include the gluon tgz archive
@@ -28,5 +27,9 @@
 ## chart/requirements.yaml
 - add requirements file for the gluon library

-## chart/templates/deployment.yaml
- remove /usr/bin/dumb-init line 89. That path does not exist in IronBank hardened image
+##  chart/charts/*.tgz
+- run ```helm dependency update ./chart``` to update the downloaded archives
+- commit any tar archives that were downloaded from the helm dependency update command.
+- commit the requirements.lock that was generated. This prevents deployments from looking for new versions.
+
+
--- a/README.md
+++ b/README.md
 # gitlab-runner

-![Version: 0.34.0-bb.1](https://img.shields.io/badge/Version-0.34.0--bb.1-informational?style=flat-square) ![AppVersion: 14.4.0](https://img.shields.io/badge/AppVersion-14.4.0-informational?style=flat-square)
+![Version: 0.36.0-bb.0](https://img.shields.io/badge/Version-0.36.0--bb.0-informational?style=flat-square) ![AppVersion: 14.6.0](https://img.shields.io/badge/AppVersion-14.6.0-informational?style=flat-square)

 GitLab Runner

@@ -35,7 +35,7 @@ helm install gitlab-runner chart/

 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| image | string | `"registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner:v14.4.0"` |  |
+| image | string | `"registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner:v14.6.0"` |  |
 | imagePullPolicy | string | `"IfNotPresent"` |  |
 | gitlabUrl | string | `"http://gitlab-webservice-default.gitlab.svc.cluster.local:8181"` |  |
 | unregisterRunners | bool | `true` |  |
@@ -48,6 +48,11 @@ helm install gitlab-runner chart/
 | rbac.podSecurityPolicy.enabled | bool | `false` |  |
 | rbac.podSecurityPolicy.resourceNames[0] | string | `"gitlab-runner"` |  |
 | metrics.enabled | bool | `true` |  |
+| metrics.portName | string | `"metrics"` |  |
+| metrics.port | int | `9252` |  |
+| metrics.serviceMonitor.enabled | bool | `true` |  |
+| service.enabled | bool | `true` |  |
+| service.type | string | `"ClusterIP"` |  |
 | runners.config | string | `"[[runners]]\n  clone_url = \"http://gitlab-webservice-default.gitlab.svc.cluster.local:8181\"\n  cache_dir = \"/tmp/gitlab-runner/cache\"\n  [runners.kubernetes]\n    namespace = \"{{.Release.Namespace}}\"\n    image = \"registry1.dso.mil/ironbank/redhat/ubi/ubi8:8.4\"\n    helper_image = \"registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v14.4.0\"\n    image_pull_secrets = [\"private-registry\"]\n  [runners.kubernetes.pod_labels]\n    \"job_id\" = \"${CI_JOB_ID}\"\n    \"job_name\" = \"${CI_JOB_NAME}\"\n    \"pipeline_id\" = \"${CI_PIPELINE_ID}\"\n"` |  |
 | runners.locked | bool | `false` |  |
 | runners.runUntagged | bool | `true` |  |

--- a/chart/.gitlab-ci.yml
+++ b/chart/.gitlab-ci.yml
+##############
+# Conditions #
+##############
+
+.if-merge-request-pipeline: &if-merge-request-pipeline
+  if: $CI_PIPELINE_SOURCE == "merge_request_event"
+
+.if-default-branch: &if-default-branch
+  if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+
+.if-stable-release-branch: &if-stable-release-branch
+  if: $CI_COMMIT_REF_NAME =~ /\A[0-9]+-[0-9]+-stable\z/
+
+.if-release-tag: &if-release-tag
+  if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?$/ && $CI_PROJECT_URL == "https://gitlab.com/gitlab-org/charts/gitlab-runner"'
+
+.if-security-release-tag: &if-security-release-tag
+  if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?$/ && $CI_PROJECT_URL == "https://gitlab.com/gitlab-org/security/charts/gitlab-runner"'
+
+#########
+# Rules #
+#########
+
+.rules:default:
+  rules:
+  - <<: *if-merge-request-pipeline
+  - <<: *if-default-branch
+  - <<: *if-stable-release-branch
+  - <<: *if-release-tag
+  - <<: *if-security-release-tag
+
+.rules:release:development:
+  rules:
+  - <<: *if-default-branch
+    when: never
+  - <<: *if-merge-request-pipeline
+    when: manual
+
+.rules:release:beta:
+  rules:
+  - <<: *if-default-branch
+
+.rules:release:stable:
+  rules:
+  - <<: *if-release-tag
+  - <<: *if-security-release-tag
+
+############
+# Pipeline #
+############
+
 default:
  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
  tags:
@@ -7,34 +58,32 @@ variables:
  GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-runner
  STABLE_REPO_URL: https://charts.helm.sh/stable

-include:
-  - template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
-
 stages:
 - test
 - release

 lint:
+  extends:
+  - .rules:default
  stage: test
  script:
  - helm lint .

 release development:
+  extends:
+  - .rules:release:development
  stage: release
  script:
  - helm init --client-only --stable-repo-url=${STABLE_REPO_URL}
  - helm package .
-  rules:
-  - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-    when: never
-  - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-    when: manual
  artifacts:
    paths:
    - gitlab-runner*.tgz
    expire_in: 7d

 release beta:
+  extends:
+  - .rules:release:beta
  stage: release
  variables:
    S3_URL: s3://${S3_BUCKET}${S3_PATH}
@@ -54,18 +103,19 @@ release beta:
  - helm repo index public --merge public/index.yaml --url ${REPO_URL}
  - aws s3 sync public ${S3_URL} --acl public-read
  - 'echo "To install repository run: helm repo add gitlab-runner-beta ${REPO_URL} && helm repo update"'
-  rules:
-  - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'

 release stable:
+  extends:
+  - .rules:release:stable
  stage: release
+  image: alpine:3.14
  script:
-  - curl --request POST
+  - apk add --no-cache curl
+  - curl --fail-with-body
+         --request POST
         --form "token=$CI_JOB_TOKEN"
         --form ref=master
         --form "variables[CHART_NAME]=$CI_PROJECT_NAME"
         --form "variables[RELEASE_REF]=$CI_COMMIT_REF_NAME"
         https://gitlab.com/api/v4/projects/2860651/trigger/pipeline
-  rules:
-  - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?$/ && $CI_PROJECT_URL == "https://gitlab.com/gitlab-org/charts/gitlab-runner"'
-  - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?$/ && $CI_PROJECT_URL == "https://gitlab.com/gitlab-org/security/charts/gitlab-runner"'
+
--- a/chart/.gitlab/changelog.yml
+++ b/chart/.gitlab/changelog.yml
@@ -26,22 +26,22 @@ label_matchers:
  - security
  scope: security-fix
 - labels:
-  - bug
+  - type::bug
  scope: fix
 - labels:
-  - technical debt
+  - type::maintenance
  scope: maintenance
 - labels:
-  - tooling::pipelines
+  - feature::enhancement
  scope: maintenance
 - labels:
-  - tooling::workflow
+  - technical debt
  scope: maintenance
 - labels:
-  - feature::maintenance
+  - tooling::pipelines
  scope: maintenance
 - labels:
-  - feature::enhancement
+  - tooling::workflow
  scope: maintenance
 - labels:
  - documentation

--- a/chart/CHANGELOG.md
+++ b/chart/CHANGELOG.md
-## v0.34.0 (2021-10-25)
+## v0.36.0 (2021-12-18)

 ### New features

- Update GitLab Runner version to 14.4.0
+- Update GitLab Runner version to 14.6.0
+
+### Bug fixes
+
+- Fix prometheus annotation unquoted value !323
+
+### GitLab Runner distribution
+
+- Fix the security release rule in .gitlab-ci.yml !324
+- Fail the stable release job on curl failures !322
+
+## v0.35.3 (2021-12-13)
+
+### Maintenance
+
+- Fix prometheus annotation unquoted value !323
+
+## v0.35.2 (2021-12-10)
+
+### Security
+
+- Update GitLab Runner version to 14.5.2
+
+## v0.35.1 (2021-12-01)
+
+### Security
+
+- Update GitLab Runner version to 14.5.1
+
+## v0.35.0 (2021-11-21)
+
+### New features
+
+- Update GitLab Runner version to 14.5.0
+
+### Maintenance
+
+- Don't run pipelines only for MRs !318
+- Update changelog generator configuration !317
+- Adds configurable value probeTimeoutSeconds !306 (Kyle Wetzler @kwetzler1)
+
+## v0.34.0-rc1 (2021-10-11)
+
+### New features
+
+- Update GitLab Runner version to 14.4.0-rc1

 ### Maintenance


--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
 apiVersion: v1
 name: gitlab-runner
-version: 0.34.0-bb.1
-appVersion: 14.4.0
+version: 0.36.0-bb.0
+appVersion: 14.6.0
 description: GitLab Runner
 keywords:
 - git

--- a/chart/Kptfile
+++ b/chart/Kptfile
@@ -5,7 +5,7 @@ metadata:
 upstream:
  type: git
  git:
-    commit: 5c735ef4a99fb7ca523e21f16426e22b6e397aaf
+    commit: 9692dde10b2b8f62c0717533933d12767d9034b6
    repo: https://gitlab.com/gitlab-org/charts/gitlab-runner
    directory: /
-    ref: v0.34.0
+    ref: v0.36.0
--- a/chart/charts/gluon-0.2.4.tgz
+++ b/chart/charts/gluon-0.2.4.tgz
--- a/chart/charts/gluon-0.2.5.tgz
+++ b/chart/charts/gluon-0.2.5.tgz
--- a/chart/requirements.lock
+++ b/chart/requirements.lock
 dependencies:
 - name: gluon
  repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon
-  version: 0.2.4
-digest: sha256:923a3908d3b4f7a00f7a1b4a231daefb6ce4800b6a6b6fd8a62cac637cff4c64
-generated: "2021-09-29T13:07:57.432540842-06:00"
+  version: 0.2.5
+digest: sha256:40b90f0f05abb5c6f7a01cd114b81042fc141f390fda38ae48c2f933876dc7b7
+generated: "2022-01-26T10:18:26.997558395-07:00"
--- a/chart/requirements.yaml
+++ b/chart/requirements.yaml
 dependencies:
 - name: gluon
-  version: "0.2.4"
+  version: "0.2.5"
  repository: "oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon"

--- a/chart/templates/bigbang/service.yaml
+++ b/chart/templates/bigbang/service.yaml
-{{ if .Values.metrics.enabled -}}
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{ include "gitlab-runner.fullname" . }}
-  labels:
-    app: {{ include "gitlab-runner.fullname" . }}
-    chart: {{ include "gitlab-runner.chart" . }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-spec:
-  selector:
-    release: "{{ .Release.Name }}"
-  ports:
-  - name: metrics
-    port: 9252
-{{- end }}
\ No newline at end of file
--- a/chart/templates/bigbang/serviceMonitor.yaml
+++ b/chart/templates/bigbang/serviceMonitor.yaml
-{{ if .Values.monitoring.enabled -}}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ include "gitlab-runner.fullname" . }}
-  labels:
-    app: {{ include "gitlab-runner.fullname" . }}
-    chart: {{ include "gitlab-runner.chart" . }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-spec:
-  endpoints:
-  - path: /metrics
-    port: metrics
-  namespaceSelector:
-    matchNames:
-    - gitlab
-  selector:
-    matchLabels:
-      release: {{ .Release.Name }}
-{{- end }}
\ No newline at end of file
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
        checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
        {{- if .Values.metrics.enabled }}
        prometheus.io/scrape: 'true'
-        prometheus.io/port: '9252'
+        prometheus.io/port: {{ .Values.metrics.port | quote }}
        {{- end }}
        {{- range $key, $value := .Values.podAnnotations }}
        {{   $key }}: {{ $value | quote }}
@@ -93,7 +93,7 @@ spec:
          exec:
            command: ["/bin/bash", "/configmaps/check-live"]
          initialDelaySeconds: 60
-          timeoutSeconds: 1
+          timeoutSeconds: {{ default 1 .Values.probeTimeoutSeconds }}
          periodSeconds: 10
          successThreshold: 1
          failureThreshold: 3
@@ -101,13 +101,13 @@ spec:
          exec:
            command: ["/usr/bin/pgrep","gitlab.*runner"]
          initialDelaySeconds: 10
-          timeoutSeconds: 1
+          timeoutSeconds: {{ default 1 .Values.probeTimeoutSeconds }}
          periodSeconds: 10
          successThreshold: 1
          failureThreshold: 3
        ports:
-        - name: metrics
-          containerPort: 9252
+        - name: {{ .Values.metrics.portName | quote }}
+          containerPort: {{ .Values.metrics.port }}
        volumeMounts:
        - name: runner-secrets
          mountPath: /secrets

--- a/chart/templates/service.yaml
+++ b/chart/templates/service.yaml
+{{- if and .Values.service.enabled .Values.metrics.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "gitlab-runner.fullname" . | quote }}
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    app: {{ include "gitlab-runner.fullname" . | quote }}
+    chart: {{ include "gitlab-runner.chart" . | quote }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+    {{- if .Values.service.labels }}
+    {{- toYaml .Values.service.labels | nindent 4 }}
+    {{- end }}
+  {{- if .Values.service.annotations }}
+  annotations:
+    {{- toYaml .Values.service.annotations | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.service.clusterIP }}
+  clusterIP: {{ .Values.service.clusterIP | quote }}
+  {{- end }}
+  {{- if .Values.service.externalIPs }}
+  externalIPs:
+    {{- toYaml .Values.service.externalIPs | nindent 4 }}
+  {{- end }}
+  {{- if .Values.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP | quote }}
+  {{- end }}
+  {{- if .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range $cidr := .Values.service.loadBalancerSourceRanges }}
+    - {{ $cidr | quote }}
+  {{- end }}
+  {{- end }}
+  ports:
+  {{- if .Values.metrics.enabled }}
+  - name: {{ .Values.metrics.portName | quote }}
+    {{- if eq .Values.service.type "NodePort" }}
+    nodePort: {{ .Values.service.metrics.nodePort }}
+    {{- end }}
+    port: {{ .Values.metrics.port }}
+    targetPort: {{ .Values.metrics.portName | quote }}
+  {{- end }}
+  {{- if .Values.service.additionalPorts }}
+  {{- toYaml .Values.service.additionalPorts | nindent 2 }}
+  {{- end }}
+  selector:
+    app: {{ include "gitlab-runner.fullname" . | quote }}
+    release: {{ .Release.Name | quote }}
+  type: {{ .Values.service.type | default "ClusterIP" | quote }}
+{{- end }}
--- a/chart/templates/servicemonitor.yaml
+++ b/chart/templates/servicemonitor.yaml
+{{- if and .Values.metrics.serviceMonitor.enabled .Values.metrics.enabled .Values.service.enabled -}}
+{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" -}}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "gitlab-runner.fullname" . | quote }}
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    app: {{ include "gitlab-runner.fullname" . | quote }}
+    chart: {{ include "gitlab-runner.chart" . | quote }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+    {{- if .Values.metrics.serviceMonitor.labels }}
+      {{- toYaml .Values.metrics.serviceMonitor.labels | nindent 4 }}
+    {{- end }}
+spec:
+  endpoints:
+  - port: {{ .Values.metrics.portName | quote }}
+    {{- if .Values.metrics.serviceMonitor.interval }}
+    interval: {{ .Values.metrics.serviceMonitor.interval }}
+    {{- end }}
+    {{- if .Values.metrics.serviceMonitor.scheme }}
+    scheme: {{ .Values.metrics.serviceMonitor.scheme | quote }}
+    {{- end }}
+    {{- if .Values.metrics.serviceMonitor.tlsConfig }}
+    tlsConfig:
+      {{- toYaml .Values.metrics.serviceMonitor.tlsConfig | nindent 6 }}
+    {{- end }}
+    {{- if .Values.metrics.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+      {{- tpl (toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6) . }}
+    {{- end }}
+    {{- if .Values.metrics.serviceMonitor.path }}
+    path: {{ .Values.metrics.serviceMonitor.path }}
+    {{- end }}
+    {{- if .Values.metrics.serviceMonitor.relabelings }}
+    relabelings:
+      {{- toYaml .Values.metrics.serviceMonitor.relabelings | nindent 6 }}
+    {{- end }}
+  {{- if .Values.metrics.serviceMonitor.jobLabel }}
+  jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }}
+  {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ $.Release.Namespace | quote }}
+  selector:
+    matchLabels:
+      app: {{ include "gitlab-runner.fullname" . | quote }}
+      chart: {{ include "gitlab-runner.chart" . | quote }}
+      release: {{ .Release.Name | quote }}
+      heritage: {{ .Release.Service | quote }}
+{{- end }}
+{{- end }}
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -9,7 +9,7 @@
 ##       don't forget to change the securityContext;
 ##       these images run on different user IDs.
 ##
-image: registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner:v14.4.0
+image: registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner:v14.6.0

 ## Specify a imagePullPolicy for the main runner deployment
 ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent'
@@ -28,6 +28,9 @@ imagePullPolicy: IfNotPresent
 # imagePullSecrets:
 #   - name: "image-pull-secret"

+## Timeout, in seconds, for liveness and readiness probes of a runner pod.
+# probeTimeoutSeconds: 1
+
 ## How many runner pods to launch.
 ##
 ## Note: Using more than one replica is not supported with a runnerToken. Use a runnerRegistrationToken
@@ -158,10 +161,122 @@ rbac:
  # imagePullSecrets: []

 ## Configure integrated Prometheus metrics exporter
+##
 ## ref: https://docs.gitlab.com/runner/monitoring/#configuration-of-the-metrics-http-server
+##
 metrics:
  enabled: true

+  ## Define a name for the metrics port
+  ##
+  portName: metrics
+
+  ## Provide a port number for the integrated Prometheus metrics exporter
+  ##
+  port: 9252
+
+  ## Configure a prometheus-operator serviceMonitor to allow autodetection of
+  ## the scraping target. Requires enabling the service resource below.
+  ##
+  serviceMonitor:
+    enabled: true
+
+    ## Provide additional labels to the service monitor ressource
+    ##
+    ## labels: {}
+
+    ## Define a scrape interval (otherwise prometheus default is used)
+    ##
+    ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config
+    ##
+    # interval: ""
+
+    ## Specify the scrape protocol scheme e.g., https or http
+    ##
+    # scheme: "http"
+
+    ## Supply a tls configuration for the service monitor
+    ##
+    ## ref: https://github.com/helm/charts/blob/master/stable/prometheus-operator/crds/crd-servicemonitor.yaml
+    ##
+    # tlsConfig: {}
+
+    ## The URI path where prometheus metrics can be scraped from
+    ##
+    # path: "/metrics"
+
+    ## A list of MetricRelabelConfigs to apply to samples before ingestion
+    ##
+    ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
+    ##
+    # metricRelabelings: []
+
+    ## A list of RelabelConfigs to apply to samples before scraping
+    ##
+    ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+    ##
+    ## relabelings: []
+
+## Configure a service resource e.g., to allow scraping metrics via
+## prometheus-operator serviceMonitor
+service:
+  enabled: true
+
+  ## Provide additonal labels for the service
+  ##
+  # labels: {}
+
+  ## Provide additonal annotations for the service
+  ##
+  # annotations: {}
+
+  ## Define a specific ClusterIP if you do not want a dynamic one
+  ##
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#choosing-your-own-ip-address
+  ##
+  # clusterIP: ""
+
+  ## Define a list of one or more external IPs for this service
+  ##
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#external-ips
+  ##
+  # externalIPs: []
+
+  ## Provide a specific loadbalancerIP e.g., of an external Loadbalancer
+  ##
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
+  ##
+  # loadBalancerIP: ""
+
+  ## Provide a list of source IP ranges to have access to this service
+  ##
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#aws-nlb-support
+  ##
+  # loadBalancerSourceRanges: []
+
+  ## Specify the service type e.g., ClusterIP, NodePort, Loadbalancer or ExternalName
+  ##
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
+  ##
+  type: ClusterIP
+
+  ## Specify the services metrics nodeport if you use a service of type nodePort
+  ##
+  # metrics:
+
+    ## Specify the node port under which the prometheus metrics of the runner are made
+    ## available.
+    ##
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#nodeport
+    ##
+    # nodePort: ""
+
+  ## Provide a list of additional ports to be exposed by this service
+  ##
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service
+  ##
+  # additionalPorts: []
+
 ## Configuration for the Pods that the runner launches for each new job
 ##
 runners:
@@ -545,6 +660,3 @@ secrets: []
 ## for a current list.
 configMaps: {}

-# BigBang Additional values
-monitoring:
-  enabled: false