From 9464d0208aa25efa4525027cbad91b4e4c584c2a Mon Sep 17 00:00:00 2001
From: CJ_Clippy <cj@futureporn.net>
Date: Thu, 20 Jun 2024 21:01:30 -0800
Subject: [PATCH] use .Release.Service

---
 apps/base/fp/release.yaml                     | 1 +
 apps/staging/fp-values.yaml                   | 1 -
 charts/fp/templates-staging/external-dns.yaml | 2 +-
 charts/fp/templates/letsencrypt.yaml          | 2 +-
 charts/fp/templates/next.yaml                 | 4 ++--
 charts/fp/templates/roles.yaml                | 2 +-
 charts/fp/templates/strapi.yaml               | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/base/fp/release.yaml b/apps/base/fp/release.yaml
index dfadb03..def571a 100644
--- a/apps/base/fp/release.yaml
+++ b/apps/base/fp/release.yaml
@@ -42,6 +42,7 @@ spec:
       url: https://strapi.piko.sbtp.xyz
       certIssuer: letsencrypt-staging
       hostname: strapi.futureporn.svc.cluster.local
+      ingressClassName: traefik
     realtime:
       imageName: gitea.futureporn.net/futureporn/realtime:latest
     adminEmail: cj@futureporn.net
diff --git a/apps/staging/fp-values.yaml b/apps/staging/fp-values.yaml
index 483f762..14e2d26 100644
--- a/apps/staging/fp-values.yaml
+++ b/apps/staging/fp-values.yaml
@@ -15,5 +15,4 @@ spec:
     strapi:
       url: https://strapi.sbtp.xyz
       hostname: strapi.sbtp.xyz
-      ingressClassName: traefik
     managedBy: Helm
\ No newline at end of file
diff --git a/charts/fp/templates-staging/external-dns.yaml b/charts/fp/templates-staging/external-dns.yaml
index 017dd48..9ac03cb 100644
--- a/charts/fp/templates-staging/external-dns.yaml
+++ b/charts/fp/templates-staging/external-dns.yaml
@@ -1,4 +1,4 @@
-{{ if eq .Values.managedBy "Helm" }} 
+{{ if eq .Release.Service "Helm" }} 
 
 ---
 apiVersion: v1
diff --git a/charts/fp/templates/letsencrypt.yaml b/charts/fp/templates/letsencrypt.yaml
index 4394076..839e704 100644
--- a/charts/fp/templates/letsencrypt.yaml
+++ b/charts/fp/templates/letsencrypt.yaml
@@ -1,4 +1,4 @@
-{{ if eq .Values.managedBy "Helm" }} 
+{{ if eq .Release.Service "Helm" }} 
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
diff --git a/charts/fp/templates/next.yaml b/charts/fp/templates/next.yaml
index 17c7315..1859fb5 100644
--- a/charts/fp/templates/next.yaml
+++ b/charts/fp/templates/next.yaml
@@ -56,7 +56,7 @@ spec:
   restartPolicy: OnFailure
 
 
-{{ if eq .Values.managedBy "Helm" }} 
+{{ if eq .Release.Service "Helm" }} 
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -64,7 +64,7 @@ metadata:
   name: next
   namespace: futureporn
   annotations:
-    kubernetes.io/ingress.class: nginx
+    kubernetes.io/ingress.class: traefik
     cert-manager.io/cluster-issuer: "{{ .Values.next.certIssuer }}"
 spec:
   backend:
diff --git a/charts/fp/templates/roles.yaml b/charts/fp/templates/roles.yaml
index f0e4fb8..b8d4834 100644
--- a/charts/fp/templates/roles.yaml
+++ b/charts/fp/templates/roles.yaml
@@ -1,4 +1,4 @@
-{{ if eq .Values.managedBy "Helm" }} 
+{{ if eq .Release.Service "Helm" }} 
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
diff --git a/charts/fp/templates/strapi.yaml b/charts/fp/templates/strapi.yaml
index 45901bd..dc07d6a 100644
--- a/charts/fp/templates/strapi.yaml
+++ b/charts/fp/templates/strapi.yaml
@@ -170,7 +170,7 @@ spec:
 
 
 
-{{ if eq .Values.managedBy "Helm" }}
+{{ if eq .Release.Service "Helm" }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -179,7 +179,7 @@ metadata:
   namespace: futureporn
   annotations:
     sbtp.xyz/managed-by: "{{ .Values.managedBy }}"
-    kubernetes.io/ingress.class: nginx
+    kubernetes.io/ingress.class: traefik
     cert-manager.io/cluster-issuer: "{{ .Values.strapi.certIssuer }}"
 spec:
   ingressClassName: "{{ .Values.strapi.ingressClassName }}"