BUG: kubernetes-ingress: limit template spec name to 15 characters (#247

) Remove "-tcp" suffix according to RFC6335. Signed-off-by: bmailhe <[email protected]>
haproxytech · Jun 27, 2024 · a63afa3 · a63afa3
1 parent 30ba3f1
commit a63afa3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/kubernetes-ingress/templates/NOTES.txt b/kubernetes-ingress/templates/NOTES.txt
@@ -29,7 +29,7 @@ Service ports mapped are:
     protocol: UDP
 {{- end }}
 {{- range .Values.controller.service.tcpPorts }}
-  - name: {{ .name }}-tcp
+  - name: {{ .name | trunc 15 | trimSuffix "-" }}
     containerPort: {{ .targetPort }}
     protocol: TCP
 {{- end }}
@@ -61,7 +61,7 @@ Service ports mapped are:
 {{- end }}
 {{- end }}
 {{- range .Values.controller.service.tcpPorts }}
-  - name: {{ .name }}-tcp
+  - name: {{ .name | trunc 15 | trimSuffix "-" }}
     containerPort: {{ .port }}
     protocol: TCP
 {{- if $useHostPort }}

diff --git a/kubernetes-ingress/templates/controller-daemonset.yaml b/kubernetes-ingress/templates/controller-daemonset.yaml
@@ -168,7 +168,7 @@ spec:
               {{- end }}
           {{- end }}
           {{- range .Values.controller.service.tcpPorts }}
-            - name: {{ .name }}-tcp
+            - name: {{ .name | trunc 15 | trimSuffix "-" }}
               containerPort: {{ .port }}
               protocol: TCP
               {{- if $useHostPort }}

diff --git a/kubernetes-ingress/templates/controller-deployment.yaml b/kubernetes-ingress/templates/controller-deployment.yaml
@@ -167,7 +167,7 @@ spec:
               protocol: UDP
           {{- end }}
           {{- range .Values.controller.service.tcpPorts }}
-            - name: {{ .name }}-tcp
+            - name: {{ .name | trunc 15 | trimSuffix "-" }}
               containerPort: {{ .targetPort }}
               protocol: TCP
           {{- end }}

diff --git a/kubernetes-ingress/templates/controller-proxy-deployment.yaml b/kubernetes-ingress/templates/controller-proxy-deployment.yaml
@@ -162,7 +162,7 @@ spec:
               protocol: UDP
           {{- end }}
           {{- range .Values.controller.service.tcpPorts }}
-            - name: {{ .name }}-tcp
+            - name: {{ .name | trunc 15 | trimSuffix "-" }}
               containerPort: {{ .targetPort }}
               protocol: TCP
           {{- end }}

diff --git a/kubernetes-ingress/templates/controller-service.yaml b/kubernetes-ingress/templates/controller-service.yaml
@@ -98,7 +98,7 @@ spec:
     {{- end }}
   {{- end }}
   {{- range .Values.controller.service.tcpPorts }}
-    - name: {{ .name }}-tcp
+    - name: {{ .name | trunc 15 | trimSuffix "-" }}
       port: {{ .port }}
       protocol: TCP
       targetPort: {{ .targetPort }}