From c8f5ad9029708fa6462696cdeef6fb99b9e1163a Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 23 Jan 2024 06:18:25 -0500
Subject: [PATCH] fix: correct issues in certificate generation

---
 plugins/scheduler-k3s/template.go                      | 2 +-
 plugins/scheduler-k3s/templates/chart/certificate.yaml | 7 +++----
 plugins/scheduler-k3s/triggers.go                      | 5 ++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/scheduler-k3s/template.go b/plugins/scheduler-k3s/template.go
index 03cc63ade..2dced9de1 100644
--- a/plugins/scheduler-k3s/template.go
+++ b/plugins/scheduler-k3s/template.go
@@ -108,7 +108,7 @@ const (
 type ProcessWeb struct {
 	Domains  []string         `yaml:"domains,omitempty"`
 	PortMaps []ProcessPortMap `yaml:"port_maps,omitempty"`
-	TLS      bool             `yaml:"tls"`
+	TLS      ProcessTls       `yaml:"tls"`
 }
 
 type ProcessResourcesMap struct {
diff --git a/plugins/scheduler-k3s/templates/chart/certificate.yaml b/plugins/scheduler-k3s/templates/chart/certificate.yaml
index 30c385042..4bb8603c7 100644
--- a/plugins/scheduler-k3s/templates/chart/certificate.yaml
+++ b/plugins/scheduler-k3s/templates/chart/certificate.yaml
@@ -1,6 +1,6 @@
 {{- $processName := "PROCESS_NAME" }}
 {{- $config := .Values.processes.PROCESS_NAME }}
-{{- if and $config.web.tls $config.domains }}
+{{- if and $config.web.tls.enabled $config.web.domains }}
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
@@ -16,7 +16,7 @@ metadata:
 spec:
   issuerRef:
     kind: ClusterIssuer
-    name: {{ $config.tls.issuer_name }}
+    name: {{ $config.web.tls.issuer_name }}
   secretName: tls-{{ $.Values.global.app_name }}-{{ $processName }}
   secretTemplate:
     annotations:
@@ -24,9 +24,8 @@ spec:
     labels:
       app.kubernetes.io/name: {{ $.Values.global.app_name }}-{{ $processName }}
       app.kubernetes.io/part-of: {{ $.Values.global.app_name }}
-status: {}
   dnsNames:
-    {{- range $config.domains }}
+    {{- range $config.web.domains }}
     - {{ . }}
     {{- end }}
 {{- end }}
diff --git a/plugins/scheduler-k3s/triggers.go b/plugins/scheduler-k3s/triggers.go
index e5ec1492c..78e7b310d 100644
--- a/plugins/scheduler-k3s/triggers.go
+++ b/plugins/scheduler-k3s/triggers.go
@@ -378,7 +378,10 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
 			processValues.Web = ProcessWeb{
 				Domains:  domains,
 				PortMaps: []ProcessPortMap{},
-				TLS:      tls,
+				TLS: ProcessTls{
+					Enabled:    tls,
+					IssuerName: issuerName,
+				},
 			}
 			processValues.ProcessType = ProcessType_Web
 			for _, portMap := range portMaps {