Katenary/katenary
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Fix problem on getting tls mapping

Browse Source 
The types were not compatible to get TLS activation
This commit is contained in:
Patrice Ferlet
2024-11-08 16:55:18 +01:00
parent 9358076a36
commit 9b392a1f64
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generator/ingress.go
View File

@@ -55,7 +55,7 @@ func NewIngress(service types.ServiceConfig, Chart *HelmChart) *Ingress {
Host: mapping.Hostname, Host: mapping.Hostname,
Class: mapping.Class, Class: mapping.Class,
Annotations: mapping.Annotations, Annotations: mapping.Annotations,
TLS: mapping.TLS, TLS: TLS{Enabled: mapping.TLS.Enabled},
} }
// ingressClassName := `{{ .Values.` + service.Name + `.ingress.class }}` // ingressClassName := `{{ .Values.` + service.Name + `.ingress.class }}`

8
generator/values.go
View File

@@ -20,6 +20,10 @@ type PersistenceValue struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
} }
type TLS struct {
Enabled bool `yaml:"enabled"`
}
// IngressValue is a ingress configuration that will be saved in values.yaml. // IngressValue is a ingress configuration that will be saved in values.yaml.
type IngressValue struct { type IngressValue struct {
Annotations map[string]string `yaml:"annotations"` Annotations map[string]string `yaml:"annotations"`
@@ -27,9 +31,7 @@ type IngressValue struct {
Path string `yaml:"path"` Path string `yaml:"path"`
Class string `yaml:"class"` Class string `yaml:"class"`
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
TLS struct { TLS TLS `yaml:"tls"`
Enabled bool `yaml:"enabled"`
} `yaml:"tls"`
} }
// Value will be saved in values.yaml. It contains configuraiton for all deployment and services. // Value will be saved in values.yaml. It contains configuraiton for all deployment and services.