fixed helm chart
All checks were successful
the build was successful

This commit is contained in:
ston1th 2019-01-18 21:54:13 +01:00
commit 10ad216fcf
7 changed files with 41 additions and 10 deletions

View file

@ -0,0 +1,15 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{ define "testapp.name" }}{{ default "testapp" .Values.nameOverride | trunc 63 }}{{ end }}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this
(by the DNS naming spec).
*/}}
{{ define "testapp.fullname" }}
{{- $name := default "testapp" .Values.nameOverride -}}
{{ printf "%s-%s" .Release.Name $name | trunc 63 -}}
{{ end }}

View file

@ -10,6 +10,11 @@ metadata:
component: db
spec:
replicas: {{ .Values.db.replicas }}
selector:
matchLabels:
app: {{ template "testapp.name" . }}-db
release: "{{ .Release.Name }}"
component: db
template:
metadata:
annotations:

View file

@ -10,6 +10,11 @@ metadata:
component: srv
spec:
replicas: {{ .Values.srv.replicas }}
selector:
matchLabels:
app: {{ template "testapp.name" . }}-srv
release: "{{ .Release.Name }}"
component: srv
template:
metadata:
annotations:
@ -42,7 +47,7 @@ spec:
protocol: TCP
env:
- name: DB_HOST
value: {{ template "testapp.fullname" . }}-db.{{ Release.Namespace }}.svc
value: {{ template "testapp.fullname" . }}-db.{{ .Release.Namespace }}.svc
{{- range $key, $value := .Values.srv.env }}
- name: {{ $key }}
value: {{ $value | quote }}

View file

@ -1,25 +1,25 @@
apiVersion: v1
kind: Service
metadata:
name: {{ template "drone.fullname" . }}-db
name: {{ template "testapp.fullname" . }}-db
annotations:
{{- range $key, $value := .Values.Db.service.annotations }}
{{- range $key, $value := .Values.service.db.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
labels:
app: {{ template "drone.name" . }}-db
app: {{ template "testapp.name" . }}-db
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:
type: {{ .Values.Db.service.type }}
type: {{ .Values.service.db.type }}
ports:
- name: http
port: {{ .Values.Db.service.httpPort }}
port: {{ .Values.service.db.httpPort }}
targetPort: 8080
{{- if hasKey .Values.Db.service "nodePort" }}
nodePort: {{ .Values.Db.service.nodePort }}
{{- if hasKey .Values.service.db "nodePort" }}
nodePort: {{ .Values.service.db.nodePort }}
{{- end }}
selector:
app: {{ template "drone.name" . }}-db
app: {{ template "testapp.name" . }}-db
release: {{ .Release.Name | quote }}

View file

@ -11,7 +11,7 @@ metadata:
host: "^{{ .Values.srv.host }}.*$"
host_regex: true
prefix: /
service: {{ template "testapp.fullname" . }}-srv.{{ Release.Namespace }}.svc:8080
service: {{ template "testapp.fullname" . }}-srv.{{ .Release.Namespace }}.svc:8080
{{- range $key, $value := .Values.service.srv.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}