Merge branch '19-gitlab-runner-upgrade-to-14-3-x' into 'main'

SKIP UPGRADE: Resolve "gitlab-runner upgrade to 14.3.x"

Closes #19

See merge request platform-one/big-bang/apps/developer-tools/gitlab-runner!31

CHANGELOG.md

@@ -28,10 +28,16 @@
 ## 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
+
 # Changelog
 
 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.33.1-bb.0] - 2021-10-14
+- upgrade to app version 14.3.1 helm chart version v0.33.1 
+
 ## [0.32.0-bb.1] - 2021-10-08
 - Adding in images.txt so gitlab-helper-image is included in release artifact
 

chart/CHANGELOG.md

+## v0.33.1 (2021-10-01)
+
+### New features
+
+- Update GitLab Runner version to 14.3.2
+
+## v0.33.0 (2021-09-29)
+
+### New features
+
+- Update GitLab Runner version to 14.3.0
+
+### Maintenance
+
+- Update container entrypoint to use `dumb-init` to avoid zombie processes !311 (Georg Lauterbach @georglauterbach)
+
 ## v0.32.0 (2021-08-22)
 
 ### New features
@@ -321,7 +337,7 @@
 - Add affinity, nodeSelector and tolerations for pod assignment !56
 - Ignore scripts directory when buildin helm chart !83
 - Bump used Runner version to 11.8.0-rc1 !87
-- Fix year in Changelog  - it's already 2019 !84
+- Fix year in Changelog - it's already 2019 !84
 
 ## v0.1.45 (2019-01-22)
 
@@ -333,4 +349,3 @@
 - Track app version in Chart.yaml !74
 - Fix the error caused by unset 'locked' value !79
 - Bump used Runner version to 11.7.0 !82
-

chart/Chart.yaml

 apiVersion: v1
 name: gitlab-runner
-version: 0.32.0-bb.1
-appVersion: 14.2.0
+version: 0.33.1-bb.0
+appVersion: 14.3.1
 description: GitLab Runner
 keywords:
 - git

chart/Kptfile

@@ -5,7 +5,7 @@ metadata:
 upstream:
     type: git
     git:
-        commit: c15f3a13d03e0b26b7c09e1defdbcd177b0d93f7
+        commit: 112eff0f3e407942846e36af0e9990c54d317a03
         repo: https://gitlab.com/gitlab-org/charts/gitlab-runner
         directory: /
-        ref: v0.32.0
+        ref: v0.33.1

chart/templates/deployment.yaml

@@ -9,6 +9,7 @@ metadata:
     heritage: "{{ .Release.Service }}"
 spec:
   replicas: {{ default 1 .Values.replicas }}
+  revisionHistoryLimit: {{ default 10 .Values.revisionHistoryLimit }}
   selector:
     matchLabels:
       app: {{ include "gitlab-runner.fullname" . }}
@@ -33,6 +34,9 @@ spec:
         {{   $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: {{ .Values.schedulerName }}
+      {{- end }}
       securityContext:
         runAsUser: {{ .Values.securityContext.runAsUser }}
         {{- if .Values.securityContext.runAsGroup }}

chart/tests/cypress/03-gitlab-login.spec.js

@@ -11,13 +11,13 @@ describe('Gitlab Login', () => {
     cy.get('a[data-qa-selector="pending_approval_tab"]').click()
 
     // version 13.12.9 and 14.0.5
-    cy.get('button[id="__BVID__30__BV_toggle_"]').click()
-    cy.get('a[href="/admin/users/'+Cypress.env('gitlab_username')+'/approve"]').click()
+    // cy.get('button[id="__BVID__30__BV_toggle_"]').click()
+    // cy.get('a[href="/admin/users/'+Cypress.env('gitlab_username')+'/approve"]').click()
 
-    // version 14.1.x 14.2.x
-    // cy.get('button[id="__BVID__32__BV_toggle_"]').click()
-    // cy.get('button[data-path="/admin/users/'+Cypress.env('gitlab_username')+'/approve"]').click()
-    // cy.get('button[data-qa-selector="approve_user_confirm_button"]').click()
+    // version 14.1.x 14.2.x 14.3.x
+    cy.get('button[id="__BVID__32__BV_toggle_"]').click()
+    cy.get('button[data-path="/admin/users/'+Cypress.env('gitlab_username')+'/approve"]').click()
+    cy.get('button[data-qa-selector="approve_user_confirm_button"]').click()
 
   })
 })

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.2.0
+image: registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner:v14.3.1
 
 ## Specify a imagePullPolicy for the main runner deployment
 ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent'
@@ -174,7 +174,7 @@ runners:
       [runners.kubernetes]
         namespace = "{{.Release.Namespace}}"
         image = "registry1.dso.mil/ironbank/redhat/ubi/ubi8:8.4"
-        helper_image = "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v14.2.0"
+        helper_image = "registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v14.3.1"
         image_pull_secrets = ["private-registry"]
       [runners.kubernetes.pod_labels]
         "job_id" = "${CI_JOB_ID}"