remove condition for ingress apiVersion

Signed-off-by: Ryan Lo <[email protected]>

Author: lowc1012

charts/flyte-core/templates/_helpers.tpl

@@ -268,145 +268,85 @@ storage:
 - path: /flyteidl.service.SignalService
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 - path: /flyteidl.service.SignalService/*
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 - path: /flyteidl.service.AdminService
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 - path: /flyteidl.service.AdminService/*
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 - path: /flyteidl.service.DataProxyService
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 - path: /flyteidl.service.DataProxyService/*
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 - path: /flyteidl.service.AuthMetadataService
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 - path: /flyteidl.service.AuthMetadataService/*
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 - path: /flyteidl.service.IdentityService
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 - path: /flyteidl.service.IdentityService/*
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 - path: /grpc.health.v1.Health
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 - path: /grpc.health.v1.Health/*
   pathType: ImplementationSpecific
   backend:
-    {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
     service:
       name: flyteadmin
       port:
         number: {{ $grpcPort }}
-    {{- else }}
-    serviceName: flyteadmin
-    servicePort: {{ $grpcPort }}
-    {{- end }}
 {{- end -}}

charts/flyte-core/templates/common/ingress-grpc.yaml

@@ -5,11 +5,7 @@
 {{- $annotations := .Values.common.ingress.annotations | deepCopy -}}
 {{- $_ := merge $annotations .Values.common.ingress.separateGrpcIngressAnnotations -}}
 
-{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
 apiVersion: networking.k8s.io/v1
-{{- else }}
-apiVersion: networking.k8s.io/v1beta1
-{{- end }}
 kind: Ingress
 metadata:
   name: {{ template "flyte.name" . }}-grpc