fix: update apiversion for ingress. fixes #75 (#85)

* fix: update apiversion for ingress. fixes #75 * fix: update ingress to generate spec based off of APIVersions * feat: allow specifcation of ingressClassName
runatlantis · Oct 27, 2021 · c25a48f · c25a48f
1 parent 6117fa1
commit c25a48f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/charts/atlantis/templates/ingress.yaml b/charts/atlantis/templates/ingress.yaml
@@ -1,7 +1,10 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "atlantis.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $pathType := .Values.ingress.pathType -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
+apiVersion: networking.k8s.io/v1
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta" -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1
@@ -22,6 +25,9 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+{{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+{{- end }}
 {{- if .Values.ingress.tls }}
   tls:
 {{ toYaml .Values.ingress.tls | indent 4 }}
@@ -33,9 +39,33 @@ spec:
         paths:
           - path: {{ .Values.ingress.path }}
             backend:
+            {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ .Values.service.port }}
+            pathType: {{ .Values.ingress.pathType }}
+            {{- else -}}
               serviceName: {{ $fullName }}
               servicePort: {{ .Values.service.port }}
+            {{- end }}
     {{ else }}
+    {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+        {{- range .paths }}
+          - path: {{ . }}
+            backend:
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+            pathType: {{ $pathType }}
+        {{- end }}
+    {{- end }}
+    {{- else -}}
     {{- range .Values.ingress.hosts }}
     - host: {{ .host | quote }}
       http:
@@ -48,4 +78,5 @@ spec:
         {{- end }}
     {{- end }}
     {{- end }}
+    {{- end }}
 {{- end }}
diff --git a/charts/atlantis/values.yaml b/charts/atlantis/values.yaml
@@ -177,10 +177,12 @@ statefulSet:
 
 ingress:
   enabled: true
+  ingressClassName:
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   path:
+  pathType: Prefix
   host:
   hosts:
     - host: chart-example.local