From 1feb953dc44fab75f990c5813aa333d9d9572113 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Wed, 4 Dec 2024 15:00:35 +0100
Subject: [PATCH] fix: add internal ingress to atlantis

---
 .../atlantis/templates/internal-ingress.yaml  | 62 +++++++++++++++++++
 charts/atlantis/values.yaml                   |  5 ++
 charts/sorcerer/values.yaml                   |  1 -
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 charts/atlantis/templates/internal-ingress.yaml

diff --git a/charts/atlantis/templates/internal-ingress.yaml b/charts/atlantis/templates/internal-ingress.yaml
new file mode 100644
index 00000000..8c1b17a5
--- /dev/null
+++ b/charts/atlantis/templates/internal-ingress.yaml
@@ -0,0 +1,62 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "Atlantis.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: {{ $fullName }}-internal
+  labels:
+    {{- include "Atlantis.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    atlantis.oceanbox.io/expose: internal
+    {{- 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:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .internal }}
+          - 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/atlantis/values.yaml b/charts/atlantis/values.yaml
index 6ac5c7d8..26f3addc 100644
--- a/charts/atlantis/values.yaml
+++ b/charts/atlantis/values.yaml
@@ -73,10 +73,15 @@ ingress:
           pathType: ImplementationSpecific
           serviceName: main-ingress-nginx-defaultbackend.ingress-nginx
           servicePort: 80
+      internal:
+        - path: /internal
+          pathType: ImplementationSpecific
   tls:
     - hosts:
         - atlantis.srv.oceanbox.io
       secretName: atlantis-tls
+  internal:
+    annotations: {}
 
 persistence:
   enabled: false
diff --git a/charts/sorcerer/values.yaml b/charts/sorcerer/values.yaml
index 0f2c92bb..718d5dcc 100644
--- a/charts/sorcerer/values.yaml
+++ b/charts/sorcerer/values.yaml
@@ -86,7 +86,6 @@ cluster:
   backupRetention: 60d
   size: 5Gi
 
-
 redis:
   enabled: true
   image: