From 91bc46df80e7e3945117cb35232452790caca91e Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Fri, 13 Jan 2017 11:50:05 -0500 Subject: [PATCH 1/3] Switch the runner to be the kubernetes executor --- .../gitlab-runner-docker-configmap.yml | 26 +++++++++---------- .../gitlab-runner-docker-deployment.yml | 4 +-- gitlab/gitlab-deployment.yml | 1 + 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/gitlab-runner/gitlab-runner-docker-configmap.yml b/gitlab-runner/gitlab-runner-docker-configmap.yml index 40b7220..18a8f26 100644 --- a/gitlab-runner/gitlab-runner-docker-configmap.yml +++ b/gitlab-runner/gitlab-runner-docker-configmap.yml @@ -4,24 +4,22 @@ metadata: name: gitlab-runner-docker namespace: gitlab data: + entrypoint: | + #!/bin/bash + + # Register the runner + /entrypoint register --non-interactive -u http://gitlab.gitlab/ci -r '49uf3mzs1qdz5vgo' --docker-image 'ruby:2.3' --executor kubernetes + + # Start the runner + /entrypoint run --user=gitlab-runner --working-directory=/home/gitlab-runner config.toml: | - concurrent = 4 + concurrent = 10 check_interval = 1 [[runners]] name = "gitlab-docker-runner" url = "http://gitlab.gitlab/ci" token = "" - executor = "docker" - [runners.docker] - tls_verify = false - image = "python:3.5" - privileged = true - disable_cache = false - volumes = ["/cache"] - [runners.cache] - Type = "s3" - ServerAddress = "http://minio.gitlab/" - AccessKey = "" - SecretKey = "" - BucketName = "runner" + executor = "kubernetes" + [runners.kubernetes] + image = "ruby:2.3" diff --git a/gitlab-runner/gitlab-runner-docker-deployment.yml b/gitlab-runner/gitlab-runner-docker-deployment.yml index ca8a348..4b496dc 100644 --- a/gitlab-runner/gitlab-runner-docker-deployment.yml +++ b/gitlab-runner/gitlab-runner-docker-deployment.yml @@ -13,7 +13,8 @@ spec: spec: containers: - name: gitlab-runner-docker - image: gitlab/gitlab-runner:v1.8.0 + image: gitlab/gitlab-runner:alpine-v1.9.2 + command: [ "/bin/sh", "-c", "chmod +x /etc/gitlab-runner/entrypoint; /etc/gitlab-runner/entrypoint" ] imagePullPolicy: Always resources: limits: @@ -34,4 +35,3 @@ spec: - name: config configMap: name: gitlab-runner-docker - diff --git a/gitlab/gitlab-deployment.yml b/gitlab/gitlab-deployment.yml index d373bde..e9d357f 100644 --- a/gitlab/gitlab-deployment.yml +++ b/gitlab/gitlab-deployment.yml @@ -19,6 +19,7 @@ spec: - name: GITLAB_OMNIBUS_CONFIG value: | external_url "http://gitlab.example.com" + gitlab_rails['initial_shared_runners_registration_token'] = '49uf3mzs1qdz5vgo' postgresql['enable']=false gitlab_rails['db_host'] = 'gitlab-postgresql' gitlab_rails['db_password']='+BP52QIxpT/flVCMpL3KXA==' From 38ed500b7472cdaff32036bb9095aa23cff94011 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Fri, 13 Jan 2017 23:56:27 -0500 Subject: [PATCH 2/3] Use updated gitlab image for registering token --- gitlab-runner/gitlab-runner-docker-configmap.yml | 3 +-- gitlab-runner/gitlab-runner-docker-deployment.yml | 3 +++ gitlab/gitlab-deployment.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gitlab-runner/gitlab-runner-docker-configmap.yml b/gitlab-runner/gitlab-runner-docker-configmap.yml index 18a8f26..1a05ad2 100644 --- a/gitlab-runner/gitlab-runner-docker-configmap.yml +++ b/gitlab-runner/gitlab-runner-docker-configmap.yml @@ -19,7 +19,6 @@ data: [[runners]] name = "gitlab-docker-runner" url = "http://gitlab.gitlab/ci" - token = "" executor = "kubernetes" [runners.kubernetes] - image = "ruby:2.3" + image = "ruby:2.3" diff --git a/gitlab-runner/gitlab-runner-docker-deployment.yml b/gitlab-runner/gitlab-runner-docker-deployment.yml index 4b496dc..6a4cb7d 100644 --- a/gitlab-runner/gitlab-runner-docker-deployment.yml +++ b/gitlab-runner/gitlab-runner-docker-deployment.yml @@ -15,6 +15,9 @@ spec: - name: gitlab-runner-docker image: gitlab/gitlab-runner:alpine-v1.9.2 command: [ "/bin/sh", "-c", "chmod +x /etc/gitlab-runner/entrypoint; /etc/gitlab-runner/entrypoint" ] + env: + - name: KUBERNETES_NAMESPACE + value: gitlab imagePullPolicy: Always resources: limits: diff --git a/gitlab/gitlab-deployment.yml b/gitlab/gitlab-deployment.yml index e9d357f..8ee4781 100644 --- a/gitlab/gitlab-deployment.yml +++ b/gitlab/gitlab-deployment.yml @@ -13,7 +13,7 @@ spec: spec: containers: - name: gitlab - image: gitlab/gitlab-ce:8.15.4-ce.1 + image: twk3/gitlab-ce:i2p imagePullPolicy: Always env: - name: GITLAB_OMNIBUS_CONFIG From f73b77ed2ba4fb8ddfed7049de53030f6bffe0b6 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Sat, 14 Jan 2017 21:45:48 -0500 Subject: [PATCH 3/3] Removed runner config values not related to the registered runner --- gitlab-runner/gitlab-runner-docker-configmap.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gitlab-runner/gitlab-runner-docker-configmap.yml b/gitlab-runner/gitlab-runner-docker-configmap.yml index 1a05ad2..40e4140 100644 --- a/gitlab-runner/gitlab-runner-docker-configmap.yml +++ b/gitlab-runner/gitlab-runner-docker-configmap.yml @@ -10,15 +10,10 @@ data: # Register the runner /entrypoint register --non-interactive -u http://gitlab.gitlab/ci -r '49uf3mzs1qdz5vgo' --docker-image 'ruby:2.3' --executor kubernetes + + cat /etc/gitlab-runner/config.toml # Start the runner /entrypoint run --user=gitlab-runner --working-directory=/home/gitlab-runner config.toml: | concurrent = 10 check_interval = 1 - - [[runners]] - name = "gitlab-docker-runner" - url = "http://gitlab.gitlab/ci" - executor = "kubernetes" - [runners.kubernetes] - image = "ruby:2.3"