Skip to content

Commit 5041dca

Browse files
pepakrizpepakriz
authored
Helm chart v2.0.0-beta1 (#79)
1 parent 5c6d667 commit 5041dca

File tree

5 files changed

+130
-5
lines changed

5 files changed

+130
-5
lines changed

‎charts/gitlab-merger-bot/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
2-
appVersion: "1.0"
2+
appVersion: "2.0.0-beta1"
33
description: A Helm chart for Kubernetes
44
name: gitlab-merger-bot
5-
version: 1.2.5
5+
version: 2.0.0-beta1
66
home: https://github.com/pepakriz/gitlab-merger-bot
77
maintainers:
88
- name: pepakriz

‎charts/gitlab-merger-bot/templates/deployment.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ spec:
5757
value: "{{ .Values.settings.skipSquashingLabel }}"
5858
- name: HIGH_PRIORITY_LABEL
5959
value: "{{ .Values.settings.highPriorityLabel }}"
60+
- name: HTTP_SERVER_ENABLE
61+
value: "{{ .Values.settings.httpServerEnable }}"
62+
- name: HTTP_SERVER_PORT
63+
value: "{{ .Values.settings.httpServerPort }}"
64+
- name: WEB_HOOK_TOKEN
65+
value: "{{ .Values.settings.webHookToken }}"
6066
{{- range $key, $value := .Values.env }}
6167
- name: "{{ $key }}"
6268
value: "{{ $value }}"

‎charts/gitlab-merger-bot/templates/ingress.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{{- if .Values.ingress.enabled }}
2+
{{- $ := . }}
3+
{{- $routePrefix := list .Values.ingress.routePrefix }}
4+
{{- $paths := .Values.ingress.paths | default $routePrefix -}}
5+
apiVersion: extensions/v1beta1
6+
kind: Ingress
7+
metadata:
8+
name: {{ include "gitlab-merger-bot.fullname" . }}
9+
{{- if .Values.ingress.annotations }}
10+
annotations:
11+
{{ toYaml .Values.ingress.annotations | indent 4 }}
12+
{{- end }}
13+
labels:
14+
app: {{ include "gitlab-merger-bot.name" . }}
15+
chart: {{ include "gitlab-merger-bot.chart" . }}
16+
heritage: {{ .Release.Service }}
17+
release: {{ .Release.Name }}
18+
{{- if .Values.ingress.labels }}
19+
{{ toYaml .Values.ingress.labels | indent 4 }}
20+
{{- end }}
21+
spec:
22+
rules:
23+
{{- if .Values.ingress.hosts }}
24+
{{- range $host := .Values.ingress.hosts }}
25+
- host: {{ tpl $host $ }}
26+
http:
27+
paths:
28+
{{- range $p := $paths }}
29+
- path: {{ tpl $p $ }}
30+
backend:
31+
serviceName: {{ include "gitlab-merger-bot.fullname" $ }}
32+
servicePort: {{ $.Values.service.port }}
33+
{{- end -}}
34+
{{- end -}}
35+
{{- else }}
36+
- http:
37+
paths:
38+
{{- range $p := $paths }}
39+
- path: {{ tpl $p $ }}
40+
backend:
41+
serviceName: {{ include "gitlab-merger-bot.fullname" $ }}
42+
servicePort: {{ $.Values.service.port }}
43+
{{- end -}}
44+
{{- end -}}
45+
{{- if .Values.ingress.tls }}
46+
tls:
47+
{{ toYaml .Values.ingress.tls | indent 4 }}
48+
{{- end -}}
49+
{{- end -}}

‎charts/gitlab-merger-bot/templates/service.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{{- if .Values.ingress.enabled }}
2+
apiVersion: v1
3+
kind: Service
4+
metadata:
5+
name: {{ include "gitlab-merger-bot.fullname" . }}
6+
{{- if .Values.service.annotations }}
7+
annotations:
8+
{{ toYaml .Values.service.annotations | indent 4 }}
9+
{{- end }}
10+
labels:
11+
app: {{ include "gitlab-merger-bot.name" . }}
12+
chart: {{ include "gitlab-merger-bot.chart" . }}
13+
heritage: {{ .Release.Service }}
14+
release: {{ .Release.Name }}
15+
{{- if .Values.service.labels }}
16+
{{ toYaml .Values.service.labels | indent 4 }}
17+
{{- end }}
18+
spec:
19+
{{- if .Values.service.clusterIP }}
20+
clusterIP: {{ .Values.service.clusterIP }}
21+
{{- end }}
22+
{{- if .Values.service.externalIPs }}
23+
externalIPs:
24+
{{ toYaml .Values.service.externalIPs | indent 4 }}
25+
{{- end }}
26+
{{- if .Values.service.loadBalancerIP }}
27+
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
28+
{{- end }}
29+
{{- if .Values.service.loadBalancerSourceRanges }}
30+
loadBalancerSourceRanges:
31+
{{- range $cidr := .Values.service.loadBalancerSourceRanges }}
32+
- {{ $cidr }}
33+
{{- end }}
34+
{{- end }}
35+
ports:
36+
- name: http
37+
{{- if eq .Values.service.type "NodePort" }}
38+
nodePort: {{ .Values.service.nodePort }}
39+
{{- end }}
40+
port: {{ .Values.service.port }}
41+
targetPort: {{ .Values.service.targetPort }}
42+
selector:
43+
app: {{ include "gitlab-merger-bot.name" . }}
44+
release: {{ .Release.Name }}
45+
type: "{{ .Values.service.type }}"
46+
{{- end -}}

‎charts/gitlab-merger-bot/values.yaml‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ restartPolicy: Never
33

44
image:
55
repository: pepakriz/gitlab-merger-bot
6-
tag: latest
6+
tag: v2.0.0-beta1
77
pullPolicy: IfNotPresent
88

99
resources:
1010
requests:
1111
cpu: 50m
12-
memory: 64Mi
12+
memory: 192Mi
1313
limits:
1414
cpu: 150m
15-
memory: 64Mi
15+
memory: 192Mi
1616

1717
annotations: {}
1818
labels: {}
@@ -21,6 +21,27 @@ tolerations: []
2121
podAnnotations: {}
2222
env: {}
2323

24+
ingress:
25+
enabled: false
26+
routePrefix: "/"
27+
annotations: {}
28+
labels: {}
29+
hosts: []
30+
paths: []
31+
tls: {}
32+
33+
service:
34+
annotations: {}
35+
labels: {}
36+
clusterIP: ""
37+
externalIPs: []
38+
loadBalancerIP: ""
39+
loadBalancerSourceRanges: []
40+
type: "ClusterIP"
41+
nodePort: "30044"
42+
port: "4000"
43+
targetPort: "4000"
44+
2445
settings:
2546
gitlabUrl: "https://gitlab.com"
2647
authToken: ""
@@ -32,3 +53,6 @@ settings:
3253
autorunManualBlockingJobs: true
3354
skipSquashingLabel: ""
3455
highPriorityLabel: ""
56+
httpServerEnable: false
57+
httpServerPort: 4000
58+
webHookToken: ""

0 commit comments

Comments
 (0)