Skip to content

Commit 7640cd2

Browse files
pepakrizpepakriz
authored
chart: refactoring (#83)
1 parent 057259b commit 7640cd2

File tree

6 files changed

+73
-51
lines changed

6 files changed

+73
-51
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
appVersion: "2.0.0-beta1"
33
description: A Helm chart for Kubernetes
44
name: gitlab-merger-bot
5-
version: 2.0.0-beta2
5+
version: 2.0.0-beta3
66
home: https://github.com/pepakriz/gitlab-merger-bot
77
maintainers:
88
- name: pepakriz

‎charts/gitlab-merger-bot/templates/_helpers.tpl‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,14 @@ Create chart name and version as used by the chart label.
3030
{{- define "gitlab-merger-bot.chart" -}}
3131
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
3232
{{- end -}}
33+
34+
{{/*
35+
Allow the release namespace to be overridden for multi-namespace deployments in combined charts
36+
*/}}
37+
{{- define "gitlab-merger-bot.namespace" -}}
38+
{{- if .Values.namespaceOverride -}}
39+
{{- .Values.namespaceOverride -}}
40+
{{- else -}}
41+
{{- .Release.Namespace -}}
42+
{{- end -}}
43+
{{- end -}}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: {{ include "gitlab-merger-bot.fullname" . }}
5+
namespace: {{ include "gitlab-merger-bot.namespace" . }}
56
{{- if .Values.annotations }}
67
annotations:
78
{{ toYaml .Values.annotations | indent 4 }}

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

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
{{- if .Values.ingress.enabled }}
2-
{{- $ := . }}
3-
{{- $routePrefix := list .Values.ingress.routePrefix }}
4-
{{- $paths := .Values.ingress.paths | default $routePrefix -}}
2+
{{- $fullName := include "gitlab-merger-bot.fullname" . -}}
3+
{{- $servicePort := .Values.service.port -}}
4+
{{- $ingressPath := .Values.ingress.path -}}
5+
{{- $extraPaths := .Values.ingress.extraPaths -}}
56
apiVersion: extensions/v1beta1
67
kind: Ingress
78
metadata:
8-
name: {{ include "gitlab-merger-bot.fullname" . }}
9+
name: {{ $fullName }}
10+
namespace: {{ include "gitlab-merger-bot.namespace" . }}
911
{{- if .Values.ingress.annotations }}
1012
annotations:
1113
{{ toYaml .Values.ingress.annotations | indent 4 }}
@@ -19,31 +21,21 @@ metadata:
1921
{{ toYaml .Values.ingress.labels | indent 4 }}
2022
{{- end }}
2123
spec:
24+
{{- if .Values.ingress.tls }}
25+
tls:
26+
{{ toYaml .Values.ingress.tls | indent 4 }}
27+
{{- end }}
2228
rules:
23-
{{- if .Values.ingress.hosts }}
24-
{{- range $host := .Values.ingress.hosts }}
25-
- host: {{ tpl $host $ }}
29+
{{- range .Values.ingress.hosts }}
30+
- host: {{ . }}
2631
http:
2732
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 $ }}
33+
{{ if $extraPaths }}
34+
{{ toYaml $extraPaths | indent 10 }}
35+
{{- end }}
36+
- path: {{ $ingressPath }}
4037
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 -}}
38+
serviceName: {{ $fullName }}
39+
servicePort: {{ $servicePort }}
40+
{{- end }}
41+
{{- end }}

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

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apiVersion: v1
33
kind: Service
44
metadata:
55
name: {{ include "gitlab-merger-bot.fullname" . }}
6+
namespace: {{ include "gitlab-merger-bot.namespace" . }}
67
{{- if .Values.service.annotations }}
78
annotations:
89
{{ toYaml .Values.service.annotations | indent 4 }}
@@ -16,31 +17,36 @@ metadata:
1617
{{ toYaml .Values.service.labels | indent 4 }}
1718
{{- end }}
1819
spec:
19-
{{- if .Values.service.clusterIP }}
20+
{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
21+
type: ClusterIP
22+
{{- if .Values.service.clusterIP }}
2023
clusterIP: {{ .Values.service.clusterIP }}
24+
{{end}}
25+
{{- else if eq .Values.service.type "LoadBalancer" }}
26+
type: {{ .Values.service.type }}
27+
{{- if .Values.service.loadBalancerIP }}
28+
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
29+
{{- end }}
30+
{{- if .Values.service.loadBalancerSourceRanges }}
31+
loadBalancerSourceRanges:
32+
{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
33+
{{- end -}}
34+
{{- else }}
35+
type: {{ .Values.service.type }}
2136
{{- end }}
2237
{{- if .Values.service.externalIPs }}
2338
externalIPs:
2439
{{ 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 }}
3440
{{- end }}
3541
ports:
36-
- name: http
37-
{{- if eq .Values.service.type "NodePort" }}
38-
nodePort: {{ .Values.service.nodePort }}
39-
{{- end }}
42+
- name: {{ .Values.service.portName }}
4043
port: {{ .Values.service.port }}
44+
protocol: TCP
4145
targetPort: {{ .Values.service.targetPort }}
46+
{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
47+
nodePort: {{.Values.service.nodePort}}
48+
{{ end }}
4249
selector:
4350
app: {{ include "gitlab-merger-bot.name" . }}
4451
release: {{ .Release.Name }}
45-
type: "{{ .Values.service.type }}"
4652
{{- end -}}

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

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,36 @@ env: {}
2323

2424
ingress:
2525
enabled: false
26-
routePrefix: "/"
2726
annotations: {}
27+
# kubernetes.io/ingress.class: nginx
28+
# kubernetes.io/tls-acme: "true"
2829
labels: {}
29-
hosts: []
30-
paths: []
30+
path: /
31+
hosts:
32+
- chart-example.local
33+
## Extra paths to prepend to every host configuration. This is useful when working with annotation based services.
34+
extraPaths: []
35+
# - path: /*
36+
# backend:
37+
# serviceName: ssl-redirect
38+
# servicePort: use-annotation
3139
tls: []
40+
# - secretName: chart-example-tls
41+
# hosts:
42+
# - chart-example.local
3243

3344
service:
45+
type: ClusterIP
46+
port: 4000
47+
targetPort: 4000
48+
nodePort: 30044
3449
annotations: {}
3550
labels: {}
51+
portName: service
3652
clusterIP: ""
3753
externalIPs: []
3854
loadBalancerIP: ""
3955
loadBalancerSourceRanges: []
40-
type: "ClusterIP"
41-
nodePort: "30044"
42-
port: "4000"
43-
targetPort: "4000"
4456

4557
settings:
4658
gitlabUrl: "https://gitlab.com"

0 commit comments

Comments
 (0)