fix(charts/buildbarn): fix ingress for frontend component (#618)

Signed-off-by: wuhuizuo <[email protected]>
PingCAP-QE · Jun 25, 2023 · a39569a · a39569a
1 parent 09c4559
commit a39569a
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 12 deletions.
diff --git a/apps/prod/buildbarn/release.yaml b/apps/prod/buildbarn/release.yaml
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: buildbarn
-      version: 0.0.5
+      version: 0.0.6
       sourceRef:
         kind: HelmRepository
         name: ee-ops

diff --git a/charts/buildbarn/Chart.yaml b/charts/buildbarn/Chart.yaml
@@ -8,4 +8,4 @@ maintainers:
   name: wuhuizuo
 name: buildbarn
 type: application
-version: 0.0.5
+version: 0.0.6
diff --git a/charts/buildbarn/templates/browser/ingress.yaml b/charts/buildbarn/templates/browser/ingress.yaml
@@ -1,18 +1,31 @@
 {{- if and .Values.browser.enabled .Values.browser.ingress.enabled -}}
 {{- $fullName := include "buildbarn.fullname" (list . "browser") -}}
 {{- $svcPort := .Values.browser.service.port -}}
+{{- if and .Values.browser.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.browser.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.browser.ingress.annotations "kubernetes.io/ingress.class" .Values.browser.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
-  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "buildbarn.labels" (list . "browser") | nindent 4 }}
   {{- with .Values.browser.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if and .Values.browser.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.browser.ingress.className }}
+  {{- end }}
 {{- if .Values.browser.ingress.tls }}
   tls:
   {{- range .Values.browser.ingress.tls }}
@@ -29,13 +42,20 @@ spec:
       http:
         paths:
         {{- range .paths }}
-          - path: {{ . }}
-            pathType: Prefix
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
             backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ $fullName }}
                 port:
                   number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
         {{- end }}
   {{- end }}
 {{- end }}
diff --git a/charts/buildbarn/templates/frontend/ingress.yaml b/charts/buildbarn/templates/frontend/ingress.yaml
@@ -1,18 +1,31 @@
 {{- if and .Values.frontend.enabled .Values.frontend.ingress.enabled -}}
 {{- $fullName := include "buildbarn.fullname" (list . "frontend") -}}
 {{- $svcPort := .Values.frontend.service.port -}}
+{{- if and .Values.frontend.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.frontend.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.frontend.ingress.annotations "kubernetes.io/ingress.class" .Values.frontend.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
-  name: {{ include "buildbarn.fullname" (list . "frontend") }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ $fullName }}
   labels:
     {{- include "buildbarn.labels" (list . "frontend") | nindent 4 }}
   {{- with .Values.frontend.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if and .Values.frontend.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.frontend.ingress.className }}
+  {{- end }}
 {{- if .Values.frontend.ingress.tls }}
   tls:
   {{- range .Values.frontend.ingress.tls }}
@@ -29,13 +42,20 @@ spec:
       http:
         paths:
         {{- range .paths }}
-          - path: {{ . }}
-            pathType: Prefix
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
             backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ $fullName }}
                 port:
                   number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
         {{- end }}
   {{- end }}
 {{- end }}
diff --git a/charts/buildbarn/values.yaml b/charts/buildbarn/values.yaml
@@ -103,6 +103,8 @@ browser:
   ingress:
     # browser.ingress.enabled -- enables Ingress
     enabled: false
+    # browser.ingress.className -- ingress class name
+    className: ""
     # browser.ingress.annotations -- ingress annotations
     annotations: {}
     # kubernetes.io/ingress.class: nginx
@@ -111,7 +113,9 @@ browser:
     # browser.ingress.hosts -- ingress accepted hostnames
     hosts: []
     #  - host: chart-example.local
-    #    paths: []
+    #    paths:
+    #     - path: /
+    #       pathType: ImplementationSpecific
     # browser.ingress.tls -- ingress TLS configuration
     tls: []
     #  - secretName: chart-example-tls
@@ -172,15 +176,18 @@ frontend:
   ingress:
     # frontend.ingress.enabled -- enables Ingress
     enabled: false
+    # frontend.ingress.className -- ingress class name
+    className: ""
     # frontend.ingress.annotations -- ingress annotations
     annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
-
     # frontend.ingress.hosts -- ingress accepted hostnames
     hosts: []
     #  - host: chart-example.local
-    #    paths: []
+    #    paths:
+    #     - path: /
+    #       pathType: ImplementationSpecific
     # frontend.ingress.tls -- ingress TLS configuration
     tls: []
     #  - secretName: chart-example-tls