mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[stable/inbucket] fix labels (#9864)
* fix labels Signed-off-by: cpanato <ctadeu@gmail.com> * update deployment version Signed-off-by: cpanato <ctadeu@gmail.com>
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
18d86ca8bb
commit
64bdc02345
@@ -2,7 +2,7 @@ apiVersion: v1
|
||||
description: Inbucket is an email testing application
|
||||
name: inbucket
|
||||
appVersion: 2.0.0
|
||||
version: 2.0.0
|
||||
version: 3.0.0
|
||||
keywords:
|
||||
- inbucket
|
||||
- mail
|
||||
|
||||
@@ -3,9 +3,8 @@ kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ template "inbucket.name" . }}-configmap
|
||||
labels:
|
||||
app: {{ template "inbucket.name" . }}
|
||||
chart: {{ template "inbucket.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
app.kubernetes.io/name: {{ include "inbucket.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
data:
|
||||
{{ toYaml .Values.extraEnv | indent 2 }}
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
apiVersion: apps/v1beta2
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
labels:
|
||||
app: {{ template "inbucket.name" . }}
|
||||
chart: {{ template "inbucket.chart" . }}
|
||||
heritage: {{ .Release.Service }}
|
||||
release: {{ .Release.Name }}
|
||||
app.kubernetes.io/name: {{ include "inbucket.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
name: {{ template "inbucket.fullname" . }}
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: {{ template "inbucket.name" . }}
|
||||
release: {{ .Release.Name | quote }}
|
||||
app.kubernetes.io/name: {{ include "inbucket.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
template:
|
||||
metadata:
|
||||
{{- if .Values.podAnnotations }}
|
||||
@@ -19,8 +18,8 @@ spec:
|
||||
{{ toYaml .Values.podAnnotations | indent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
app: {{ template "inbucket.name" . }}
|
||||
release: {{ .Release.Name | quote }}
|
||||
app.kubernetes.io/name: {{ include "inbucket.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
spec:
|
||||
containers:
|
||||
- name: {{ template "inbucket.name" . }}
|
||||
|
||||
@@ -9,10 +9,9 @@ metadata:
|
||||
{{ toYaml .Values.ingress.annotations | indent 4 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
app: {{ template "inbucket.name" . }}
|
||||
chart: {{ template "inbucket.chart" . }}
|
||||
heritage: {{ .Release.Service }}
|
||||
release: {{ .Release.Name }}
|
||||
app.kubernetes.io/name: {{ include "inbucket.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
name: {{ $fullName }}
|
||||
spec:
|
||||
{{- if .Values.ingress.tls }}
|
||||
|
||||
@@ -6,10 +6,9 @@ metadata:
|
||||
{{ toYaml .Values.service.annotations | indent 4 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
app: {{ template "inbucket.name" . }}
|
||||
chart: {{ template "inbucket.chart" . }}
|
||||
heritage: {{ .Release.Service }}
|
||||
release: {{ .Release.Name }}
|
||||
app.kubernetes.io/name: {{ include "inbucket.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
name: {{ template "inbucket.fullname" . }}
|
||||
spec:
|
||||
type: "{{ .Values.service.type }}"
|
||||
@@ -48,5 +47,5 @@ spec:
|
||||
nodePort: {{ .Values.service.nodePort.pop3 }}
|
||||
{{- end }}
|
||||
selector:
|
||||
app: {{ template "inbucket.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
app.kubernetes.io/name: {{ include "inbucket.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
|
||||
@@ -4,12 +4,11 @@ kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ template "inbucket.name" . }}-tests
|
||||
labels:
|
||||
chart: {{ template "inbucket.chart" . }}
|
||||
app: {{ template "inbucket.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
app.kubernetes.io/name: {{ include "inbucket.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
data:
|
||||
run.sh: |-
|
||||
@test "Testing Inbucket is accessible" {
|
||||
curl --retry 48 --retry-delay 10 {{ template "inbucket.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port.http }}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,10 +3,9 @@ kind: Pod
|
||||
metadata:
|
||||
name: "{{ template "inbucket.name" . }}-test-{{ randAlphaNum 5 | lower }}"
|
||||
labels:
|
||||
chart: {{ template "inbucket.chart" . }}
|
||||
app: {{ template "inbucket.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
app.kubernetes.io/name: {{ include "inbucket.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": test-success
|
||||
spec:
|
||||
|
||||
Reference in New Issue
Block a user