From 2fcfed1d51a5ec55a9e3798f7889bf856dd26b3e Mon Sep 17 00:00:00 2001
From: "chenyu.jiang" <chenyu.jiang@bytedance.com>
Date: Mon, 11 Jul 2022 18:23:32 -0700
Subject: [PATCH] modify apiserver ingress

---
 .../kuberay-apiserver/templates/ingress.yaml  | 63 ++++++++++++++++---
 .../charts/kuberay-apiserver/values.yaml      |  2 +-
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/helm-chart/kuberay/charts/kuberay-apiserver/templates/ingress.yaml b/helm-chart/kuberay/charts/kuberay-apiserver/templates/ingress.yaml
index 9c5bb4856ab..64ed6f50df8 100644
--- a/helm-chart/kuberay/charts/kuberay-apiserver/templates/ingress.yaml
+++ b/helm-chart/kuberay/charts/kuberay-apiserver/templates/ingress.yaml
@@ -1,16 +1,61 @@
-{{- if .Values.ingress.create -}}
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "kuberay-apiserver.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.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: kuberay-apiserver-ingress
+  name: {{ $fullName }}
+  labels:
+    {{- include "kuberay-apiserver.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
   rules:
-    - host: api.kuberay.{{ .Values.ingress.host }}
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
       http:
         paths:
-          - backend:
-              serviceName: kuberay-apiserver-service
-              servicePort: 8888
-            path: /
-            pathType: ImplementationSpecific
-{{- end -}}
\ No newline at end of file
+          {{- range .paths }}
+          - 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/helm-chart/kuberay/charts/kuberay-apiserver/values.yaml b/helm-chart/kuberay/charts/kuberay-apiserver/values.yaml
index ecf33dddd26..9d0637aa582 100644
--- a/helm-chart/kuberay/charts/kuberay-apiserver/values.yaml
+++ b/helm-chart/kuberay/charts/kuberay-apiserver/values.yaml
@@ -47,4 +47,4 @@ service:
       nodePort: 31887
 
 ingress:
-  create: false
+  enabled: false