github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[incubator/haproxy-ingress] Labels are not compatible with Istio requirements (#22076)

Browse Source 
* Adjust app label to match Istio requirements

Signed-off-by: Ivan Rizzante <ivan.rizzante@tech.sdb.it>

* Bump chart version

Signed-off-by: Ivan Rizzante <ivan.rizzante@tech.sdb.it>

* Add default values

Signed-off-by: Ivan Rizzante <ivan.rizzante@tech.sdb.it>

Co-authored-by: Ivan Rizzante <ivan.rizzante@tech.sdb.it>
This commit is contained in:
irizzant
2020-04-23 19:34:06 -07:00
committed by GitHub
co-authored by Ivan Rizzante
parent 1814915211
commit a6fb274dd1
11 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
incubator/haproxy-ingress/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: haproxy-ingress
version: 0.0.24
version: 0.0.25
appVersion: 0.7.2
home: https://github.com/jcmoraisjr/haproxy-ingress
description: Ingress controller implementation for haproxy loadbalancer.
incubator/haproxy-ingress/templates/_helpers.tpl
+14
View File
@@ -6,6 +6,20 @@ Expand the name of the chart.
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create the app label for controller
*/}}
{{- define "haproxy-ingress.labels.app.controller" -}}
{{ default "haproxy-ingress.name" }}-controller
{{- end -}}
{{/*
Create the app label for default backend
*/}}
{{- define "haproxy-ingress.labels.app.default-backend" -}}
{{ default "haproxy-ingress.name" }}-default-backend
{{- 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).
incubator/haproxy-ingress/templates/controller-daemonset.yaml
+3 -3
View File
@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
labels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
chart: {{ template "haproxy-ingress.chart" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
@@ -16,7 +16,7 @@ spec:
minReadySeconds: {{ .Values.controller.minReadySeconds }}
selector:
matchLabels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
release: {{ .Release.Name }}
template:
metadata:
@@ -28,7 +28,7 @@ spec:
{{ toYaml .Values.controller.podAnnotations | indent 8}}
{{- end }}
labels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
{{- if .Values.controller.podLabels }}
incubator/haproxy-ingress/templates/controller-deployment.yaml
+3 -3
View File
@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
chart: {{ template "haproxy-ingress.chart" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
@@ -20,7 +20,7 @@ spec:
minReadySeconds: {{ .Values.controller.minReadySeconds }}
selector:
matchLabels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
template:
@@ -33,7 +33,7 @@ spec:
{{ toYaml .Values.controller.podAnnotations | indent 8}}
{{- end }}
labels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
{{- if .Values.controller.podLabels }}
incubator/haproxy-ingress/templates/controller-metrics-service.yaml
+2 -2
View File
@@ -7,7 +7,7 @@ metadata:
{{ toYaml .Values.controller.metrics.service.annotations | indent 4 }}
{{- end }}
labels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
component: "{{ .Values.controller.name }}"
heritage: {{ .Release.Service }}
@@ -32,7 +32,7 @@ spec:
port: {{ .Values.controller.metrics.service.servicePort }}
targetPort: metrics
selector:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
type: "{{ .Values.controller.metrics.service.type }}"
incubator/haproxy-ingress/templates/controller-poddisruptionbudget.yaml
+2 -2
View File
@@ -2,7 +2,7 @@ apiVersion: policy/v1beta1
kind: PodDisruptionBudget
metadata:
labels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
chart: {{ template "haproxy-ingress.chart" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
@@ -11,7 +11,7 @@ metadata:
spec:
selector:
matchLabels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
release: {{ .Release.Name }}
component: "{{ .Values.controller.name }}"
minAvailable: {{ .Values.controller.minAvailable }}
incubator/haproxy-ingress/templates/controller-service.yaml
+2 -2
View File
@@ -9,7 +9,7 @@ metadata:
{{- if .Values.controller.service.labels }}
{{ toYaml .Values.controller.service.labels | indent 4 }}
{{- end }}
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
chart: {{ template "haproxy-ingress.chart" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
@@ -65,7 +65,7 @@ spec:
targetPort: "{{ tpl $key $ }}-tcp"
{{- end }}
selector:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
type: "{{ .Values.controller.service.type }}"
incubator/haproxy-ingress/templates/controller-stats-service.yaml
+2 -2
View File
@@ -7,7 +7,7 @@ metadata:
{{ toYaml .Values.controller.stats.service.annotations | indent 4 }}
{{- end }}
labels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
component: "{{ .Values.controller.name }}"
heritage: {{ .Release.Service }}
@@ -32,7 +32,7 @@ spec:
port: {{ .Values.controller.stats.service.servicePort }}
targetPort: stats
selector:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.controller" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
type: "{{ .Values.controller.stats.service.type }}"
incubator/haproxy-ingress/templates/default-backend-deployment.yaml
+3 -3
View File
@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.default-backend" . }}
chart: {{ template "haproxy-ingress.chart" . }}
component: "{{ .Values.defaultBackend.name }}"
heritage: {{ .Release.Service }}
@@ -14,7 +14,7 @@ spec:
replicas: {{ .Values.defaultBackend.replicaCount }}
selector:
matchLabels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.default-backend" . }}
component: "{{ .Values.defaultBackend.name }}"
release: {{ .Release.Name }}
template:
@@ -24,7 +24,7 @@ spec:
{{ toYaml .Values.defaultBackend.podAnnotations | indent 8 }}
{{- end }}
labels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.default-backend" . }}
component: "{{ .Values.defaultBackend.name }}"
release: {{ .Release.Name }}
{{- if .Values.defaultBackend.podLabels }}
incubator/haproxy-ingress/templates/default-backend-poddisruptionbudget.yaml
+2 -2
View File
@@ -2,7 +2,7 @@ apiVersion: policy/v1beta1
kind: PodDisruptionBudget
metadata:
labels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.default-backend" . }}
chart: {{ template "haproxy-ingress.chart" . }}
component: "{{ .Values.defaultBackend.name }}"
release: {{ .Release.Name }}
@@ -11,7 +11,7 @@ metadata:
spec:
selector:
matchLabels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.default-backend" . }}
release: {{ .Release.Name }}
component: "{{ .Values.defaultBackend.name }}"
minAvailable: {{ .Values.defaultBackend.minAvailable }}
incubator/haproxy-ingress/templates/default-backend-service.yaml
+2 -2
View File
@@ -7,7 +7,7 @@ metadata:
{{ toYaml .Values.defaultBackend.service.annotations | indent 4 }}
{{- end }}
labels:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.default-backend" . }}
chart: {{ template "haproxy-ingress.chart" . }}
component: "{{ .Values.defaultBackend.name }}"
release: {{ .Release.Name }}
@@ -35,7 +35,7 @@ spec:
protocol: TCP
targetPort: http
selector:
app: {{ template "haproxy-ingress.name" . }}
app: {{ template "haproxy-ingress.labels.app.default-backend" . }}
component: "{{ .Values.defaultBackend.name }}"
release: {{ .Release.Name }}
type: "{{ .Values.defaultBackend.service.type }}"