Commit baabb6dc authored by Jeff Kwan's avatar Jeff Kwan
Browse files

feat: Recommended and custom labels on resources

parent 19d4947f

assets/auto-deploy-app/Chart.yaml

+1 −1
Original line number Diff line number Diff line 
apiVersion: v1

description: GitLab's Auto-deploy Helm Chart

name: auto-deploy-app

version: 2.2.0

version: 2.3.0

icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.png

assets/auto-deploy-app/README.md

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
| image.tag                     |             | `stable`                           |

| image.pullPolicy              |             | `Always`                           |

| image.secrets                 |             | `[name: gitlab-registry]`          |

| extraLabels                   | Allow labelling resources with custom key/value pairs | `{}` |

| podAnnotations                | Pod annotations | `{}`                           |

| application.track             |             | `stable`                           |

| application.tier              |             | `web`                              |

assets/auto-deploy-app/templates/_helpers.tpl

+14 −0
Original line number Diff line number Diff line
@@ -48,3 +48,17 @@ Get SecRule's arguments with unescaped single&double quotes 
{{- $action := .action | quote | replace "\"" "\\\"" | replace "'" "\\'" -}}

{{- printf "SecRule %s %s %s" .variable $operator $action -}}

{{- end -}}



{{- define "sharedlabels" -}}

app: {{ template "appname" . }}

chart: "{{ .Chart.Name }}-{{ .Chart.Version| replace "+" "_" }}"

release: {{ .Release.Name }}

heritage: {{ .Release.Service }}

app.kubernetes.io/name: {{ template "appname" . }}

helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version| replace "+" "_" }}"

app.kubernetes.io/managed-by: {{ .Release.Service }}

app.kubernetes.io/instance: {{ .Release.Name }}

{{- if .Values.extraLabels }}

{{ toYaml $.Values.extraLabels }}

{{- end }}

{{- end -}}
 
 No newline at end of file

assets/auto-deploy-app/templates/db-initialize-job.yaml

+1 −4
Original line number Diff line number Diff line
@@ -4,10 +4,7 @@ kind: Job 
metadata:

  name: {{ template "trackableappname" . }}-db-initialize

  labels:

    app: {{ template "appname" . }}

    chart: "{{ .Chart.Name }}-{{ .Chart.Version| replace "+" "_" }}"

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

{{ include "sharedlabels" . | indent 4 }}

  annotations:

    "helm.sh/hook": post-install

    "helm.sh/hook-delete-policy": before-hook-creation

assets/auto-deploy-app/templates/db-migrate-hook.yaml

+1 −4
Original line number Diff line number Diff line
@@ -4,10 +4,7 @@ kind: Job 
metadata:

  name: {{ template "trackableappname" . }}-db-migrate

  labels:

    app: {{ template "appname" . }}

    chart: "{{ .Chart.Name }}-{{ .Chart.Version| replace "+" "_" }}"

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

{{ include "sharedlabels" . | indent 4 }}

  annotations:

    "helm.sh/hook": pre-upgrade

    "helm.sh/hook-delete-policy": before-hook-creation