Skip to content

Commit 028fe10

Browse files
dunglasdunglas
committed
Modernize K8S chart
1 parent be01dbd commit 028fe10

15 files changed

+106
-71
lines changed

‎api/helm/api/.helmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@
1919
.project
2020
.idea/
2121
*.tmproj
22+
.vscode/

‎api/helm/api/Chart.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
apiVersion: v1
2+
appVersion: 0.1.0
23
description: A Helm chart for an API Platform API
34
name: api
45
version: 0.1.0
6+
home: https://api-platform.com
57
icon: https://api-platform.com/logo-250x250.png

‎api/helm/api/templates/_helpers.tpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
1818
{{- define "postgresql.fullname" -}}
1919
{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
2020
{{- end -}}
21+
22+
{{/*
23+
Create chart name and version as used by the chart label.
24+
*/}}
25+
{{- define "chart" -}}
26+
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
27+
{{- end -}}

‎api/helm/api/templates/configmap.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ kind: ConfigMap
33
metadata:
44
name: {{ template "fullname" . }}
55
labels:
6-
app: {{ template "fullname" . }}
7-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
8-
release: "{{ .Release.Name }}"
9-
heritage: "{{ .Release.Service }}"
6+
app.kubernetes.io/name: {{ include "name" . }}
7+
app.kubernetes.io/part-of: {{ include "name" . }}
8+
helm.sh/chart: {{ include "chart" . }}
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1011
data:
1112
env: {{ .Values.php.env | quote }}
1213
debug: {{ .Values.php.debug | quote }}

‎api/helm/api/templates/ingress.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
apiVersion: extensions/v1beta1
22
kind: Ingress
33
metadata:
4-
name: {{ template "name" . }}-ingress
4+
name: {{ template "fullname" . }}
55
labels:
6-
app: {{ template "name" . }}-ingress
7-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
8-
release: {{ .Release.Name }}
9-
heritage: {{ .Release.Service }}
6+
app.kubernetes.io/name: {{ include "name" . }}
7+
app.kubernetes.io/part-of: {{ include "name" . }}
8+
helm.sh/chart: {{ include "chart" . }}
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1011
{{- with .Values.ingress.annotations }}
1112
annotations:
1213
{{- toYaml . | nindent 4 }}

‎api/helm/api/templates/mercure-deployment.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,23 @@
22
apiVersion: extensions/v1beta1
33
kind: Deployment
44
metadata:
5-
name: {{ template "name" . }}-mercure
5+
name: {{ template "fullname" . }}-mercure
66
labels:
7-
app: {{ template "name" . }}-mercure
8-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
9-
release: {{ .Release.Name }}
10-
heritage: {{ .Release.Service }}
7+
app.kubernetes.io/name: {{ include "name" . }}-mercure
8+
app.kubernetes.io/part-of: {{ include "name" . }}
9+
helm.sh/chart: {{ include "chart" . }}
10+
app.kubernetes.io/instance: {{ .Release.Name }}
11+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1112
spec:
1213
replicas: {{ .Values.mercure.replicaCount }}
1314
template:
1415
metadata:
1516
labels:
16-
app: {{ template "name" . }}-mercure
17-
release: {{ .Release.Name }}
17+
app.kubernetes.io/name: {{ include "name" . }}-mercure
18+
app.kubernetes.io/part-of: {{ include "name" . }}
19+
helm.sh/chart: {{ include "chart" . }}
20+
app.kubernetes.io/instance: {{ .Release.Name }}
21+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1822
spec:
1923
containers:
2024
- name: {{ .Chart.Name }}-mercure

‎api/helm/api/templates/mercure-service.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: mercure
5+
name: {{ template "fullname" . }}-mercure
66
labels:
7-
app: {{ template "name" . }}-mercure
8-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
9-
release: {{ .Release.Name }}
10-
heritage: {{ .Release.Service }}
7+
app.kubernetes.io/name: {{ include "name" . }}-mercure
8+
app.kubernetes.io/part-of: {{ include "name" . }}
9+
helm.sh/chart: {{ include "chart" . }}
10+
app.kubernetes.io/instance: {{ .Release.Name }}
11+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1112
spec:
1213
type: {{ .Values.mercure.service.type }}
1314
ports:
@@ -16,6 +17,7 @@ spec:
1617
protocol: TCP
1718
name: http
1819
selector:
19-
app: {{ template "name" . }}-mercure
20-
release: {{ .Release.Name }}
20+
app.kubernetes.io/name: {{ include "name" . }}-mercure
21+
app.kubernetes.io/part-of: {{ include "name" . }}
22+
app.kubernetes.io/instance: {{ .Release.Name }}
2123
{{- end -}}

‎api/helm/api/templates/nginx-deployment.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
apiVersion: extensions/v1beta1
22
kind: Deployment
33
metadata:
4-
name: {{ template "name" . }}-nginx
4+
name: {{ template "fullname" . }}-nginx
55
labels:
6-
app: {{ template "name" . }}-nginx
7-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
8-
release: {{ .Release.Name }}
9-
heritage: {{ .Release.Service }}
6+
app.kubernetes.io/name: {{ include "name" . }}-nginx
7+
app.kubernetes.io/part-of: {{ include "name" . }}
8+
helm.sh/chart: {{ include "chart" . }}
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1011
spec:
1112
replicas: {{ .Values.nginx.replicaCount }}
1213
template:
1314
metadata:
1415
labels:
15-
app: {{ template "name" . }}-nginx
16-
release: {{ .Release.Name }}
16+
app.kubernetes.io/name: {{ include "name" . }}-nginx
17+
app.kubernetes.io/part-of: {{ include "name" . }}
18+
helm.sh/chart: {{ include "chart" . }}
19+
app.kubernetes.io/instance: {{ .Release.Name }}
20+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1721
spec:
1822
containers:
1923
- name: {{ .Chart.Name }}-nginx

‎api/helm/api/templates/nginx-service.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ kind: Service
33
metadata:
44
name: api
55
labels:
6-
app: {{ template "name" . }}-nginx
7-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
8-
release: {{ .Release.Name }}
9-
heritage: {{ .Release.Service }}
6+
app.kubernetes.io/name: {{ include "name" . }}-nginx
7+
app.kubernetes.io/part-of: {{ include "name" . }}
8+
helm.sh/chart: {{ include "chart" . }}
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1011
spec:
1112
type: NodePort
1213
ports:
1314
- port: 80
1415
targetPort: 80
1516
protocol: TCP
1617
selector:
17-
app: {{ template "name" . }}-nginx
18-
release: {{ .Release.Name }}
18+
app.kubernetes.io/name: {{ include "name" . }}-nginx
19+
app.kubernetes.io/instance: {{ .Release.Name }}

‎api/helm/api/templates/php-deployment.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
apiVersion: extensions/v1beta1
22
kind: Deployment
33
metadata:
4-
name: {{ template "name" . }}-php
4+
name: {{ template "fullname" . }}-php
55
labels:
6-
app: {{ template "name" . }}-php
7-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
8-
release: {{ .Release.Name }}
9-
heritage: {{ .Release.Service }}
6+
app.kubernetes.io/name: {{ include "name" . }}-php
7+
app.kubernetes.io/part-of: {{ include "name" . }}
8+
helm.sh/chart: {{ include "chart" . }}
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1011
spec:
1112
replicas: {{ .Values.php.replicaCount }}
1213
template:
1314
metadata:
1415
labels:
15-
app: {{ template "name" . }}-php
16-
release: {{ .Release.Name }}
16+
app.kubernetes.io/name: {{ include "name" . }}
17+
app.kubernetes.io/part-of: {{ include "name" . }}
18+
helm.sh/chart: {{ include "chart" . }}
19+
app.kubernetes.io/instance: {{ .Release.Name }}
20+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1721
spec:
1822
containers:
1923
- name: {{ .Chart.Name }}-php

‎api/helm/api/templates/php-service.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ kind: Service
33
metadata:
44
name: php
55
labels:
6-
app: {{ template "name" . }}-php
7-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
8-
release: {{ .Release.Name }}
9-
heritage: {{ .Release.Service }}
6+
app.kubernetes.io/name: {{ include "name" . }}-php
7+
app.kubernetes.io/part-of: {{ include "name" . }}
8+
helm.sh/chart: {{ include "chart" . }}
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1011
spec:
1112
type: ClusterIP
1213
ports:
1314
- port: 9000
1415
selector:
15-
app: {{ template "name" . }}-php
16-
release: {{ .Release.Name }}
16+
app.kubernetes.io/name: {{ include "name" . }}-php
17+
app.kubernetes.io/instance: {{ .Release.Name }}

‎api/helm/api/templates/secrets.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ kind: Secret
44
metadata:
55
name: {{ template "fullname" . }}
66
labels:
7-
app: {{ template "fullname" . }}
8-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9-
release: "{{ .Release.Name }}"
10-
heritage: "{{ .Release.Service }}"
7+
app.kubernetes.io/name: {{ include "name" . }}
8+
app.kubernetes.io/part-of: {{ include "name" . }}
9+
helm.sh/chart: {{ include "chart" . }}
10+
app.kubernetes.io/instance: {{ .Release.Name }}
11+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1112
type: Opaque
1213
data:
1314
{{ if .Values.postgresql.enabled }}

‎api/helm/api/templates/varnish-deployment.yaml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,22 @@
22
apiVersion: extensions/v1beta1
33
kind: Deployment
44
metadata:
5-
name: {{ template "name" . }}-varnish
5+
name: {{ template "fullname" . }}-varnish
66
labels:
7-
app: {{ template "name" . }}-varnish
8-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
9-
release: {{ .Release.Name }}
10-
heritage: {{ .Release.Service }}
7+
app.kubernetes.io/name: {{ include "name" . }}-varnish
8+
app.kubernetes.io/part-of: {{ include "name" . }}
9+
helm.sh/chart: {{ include "chart" . }}
10+
app.kubernetes.io/instance: {{ .Release.Name }}
11+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1112
spec:
1213
replicas: {{ .Values.varnish.replicaCount }}
1314
template:
1415
metadata:
1516
labels:
16-
app: {{ template "name" . }}-varnish
17-
release: {{ .Release.Name }}
17+
app.kubernetes.io/name: {{ include "name" . }}
18+
helm.sh/chart: {{ include "chart" . }}
19+
app.kubernetes.io/instance: {{ .Release.Name }}
20+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1821
spec:
1922
containers:
2023
- name: {{ .Chart.Name }}-varnish

‎api/helm/api/templates/varnish-service.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@ kind: Service
44
metadata:
55
name: varnish
66
labels:
7-
app: {{ template "name" . }}-varnish
8-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
9-
release: {{ .Release.Name }}
10-
heritage: {{ .Release.Service }}
7+
app.kubernetes.io/name: {{ include "name" . }}-varnish
8+
app.kubernetes.io/part-of: {{ include "name" . }}
9+
helm.sh/chart: {{ include "chart" . }}
10+
app.kubernetes.io/instance: {{ .Release.Name }}
11+
app.kubernetes.io/managed-by: {{ .Release.Service }}
1112
spec:
1213
type: NodePort
1314
ports:
1415
- port: 80
1516
targetPort: 80
1617
protocol: TCP
1718
selector:
18-
app: {{ template "name" . }}-varnish
19-
release: {{ .Release.Name }}
19+
app.kubernetes.io/name: {{ include "name" . }}-varnish
20+
app.kubernetes.io/instance: {{ .Release.Name }}
2021
{{- end -}}

‎api/helm/api/values.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,12 @@ mercure:
7878
# kubernetes.io/tls-acme: "true"
7979
paths: []
8080
hosts:
81-
- chart-example.local
81+
- api-platform.local
8282
tls: []
83-
# - secretName: chart-example-tls
83+
# - secretName: api-platform-tls
8484
# hosts:
85-
# - chart-example.local
85+
# - api-platform.local
86+
8687
resources: {}
8788
# We usually recommend not to specify default resources and to leave this as a conscious
8889
# choice for the user. This also increases chances charts run on environments with little
@@ -95,7 +96,9 @@ mercure:
9596
# cpu: 100m
9697
# memory: 128Mi
9798
nodeSelector: {}
99+
98100
tolerations: []
101+
99102
affinity: {}
100103

101104
external-dns:
@@ -153,8 +156,7 @@ resources: {}
153156
# choice for the user. This also increases chances charts run on environments with little
154157
# resources, such as Minikube. If you do want to specify resources, uncomment the following
155158
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
156-
# limits:
157-
# cpu: 100m
159+
# é cpu: 100m
158160
# memory: 128Mi
159161
# requests:
160162
# cpu: 100m

0 commit comments

Comments
 (0)