Skip to content

Commit b3b7ff9

Browse files
committed
RELEASE/MINOR: kubernetes-ingress: Tag release 1.35.2
Changes in kubernetes-ingress: - CRD job updates and bug fixes Signed-off-by: Dinko Korunic <[email protected]>
1 parent 89cc99f commit b3b7ff9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

kubernetes-ingress/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ apiVersion: v2
1616
name: kubernetes-ingress
1717
description: A Helm chart for HAProxy Kubernetes Ingress Controller
1818
type: application
19-
version: 1.35.1
19+
version: 1.35.2
2020
appVersion: 1.10.10
2121
kubeVersion: ">=1.22.0-0"
2222
keywords:

kubernetes-ingress/templates/_helpers.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ Create a FQDN for the Service metrics.
153153
{{- end -}}
154154
155155
{{/*
156-
Create a default fully qualified default CRD job name.
156+
Create a default fully qualified unique CRD job name.
157157
*/}}
158158
{{- define "kubernetes-ingress.crdjob.fullname" -}}
159-
{{- printf "%s-%s" (include "kubernetes-ingress.fullname" .) "crdjob" | trunc 63 | trimSuffix "-" -}}
159+
{{- printf "%s-%s-%d" (include "kubernetes-ingress.fullname" .) "crdjob" .Release.Revision | trunc 63 | trimSuffix "-" -}}
160160
{{- end -}}
161161
162162
{{/* vim: set filetype=mustache: */}}

kubernetes-ingress/templates/controller-crdjob.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ metadata:
2626
app.kubernetes.io/instance: {{ .Release.Name }}
2727
app.kubernetes.io/version: {{ .Chart.AppVersion }}
2828
spec:
29-
{{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }}
29+
{{- if or (.Capabilities.APIVersions.Has "batch/v1alpha1") (semverCompare ">=1.23.0-0" .Capabilities.KubeVersion.Version) }}
3030
ttlSecondsAfterFinished: 0
3131
{{- end }}
3232
backoffLimit: 0

0 commit comments

Comments
 (0)