feat: support manually managed cert issuers on k3s
The `cert-issuer-name` and `cert-issuer-kind` properties point an app's generated `Certificate` at a cert-manager issuer created outside of Dokku, allowing certificates to be issued through solvers the built-in letsencrypt integration cannot use, such as `dns01` for wildcard certificates. Setting an issuer enables https on its own, as a manually managed issuer has no email for Dokku to configure. An imported certificate still takes precedence, and `letsencrypt-server false` remains the single off switch. Dokku warns before a build starts when the referenced issuer is absent from the cluster, without blocking the deploy. Wildcard domains no longer collide with their apex domain when generating ingress names, and `letsencrypt-server` values are now validated when set rather than at deploy time.
This commit is contained in:
@@ -16,7 +16,6 @@ import (
|
||||
"github.com/dokku/dokku/plugins/config"
|
||||
"github.com/dokku/dokku/plugins/cron"
|
||||
"github.com/dokku/dokku/plugins/registry"
|
||||
"github.com/gosimple/slug"
|
||||
"github.com/kballard/go-shellquote"
|
||||
)
|
||||
|
||||
@@ -118,33 +117,12 @@ func BuildAppChart(ctx context.Context, appName, imageTag string, opts BuildOpti
|
||||
}
|
||||
}
|
||||
|
||||
tlsEnabled := false
|
||||
issuerKind := ""
|
||||
issuerName := ""
|
||||
useImportedCert := false
|
||||
appIssuer := AppIssuer{}
|
||||
|
||||
if importedCertExists {
|
||||
tlsEnabled = true
|
||||
useImportedCert = true
|
||||
} else {
|
||||
server := getComputedLetsencryptServer(appName)
|
||||
|
||||
switch server {
|
||||
case "prod", "production":
|
||||
computedEmail := getComputedLetsencryptEmailProd(appName)
|
||||
tlsEnabled = computedEmail != ""
|
||||
issuerKind, issuerName, appIssuer = resolveLetsencryptIssuer(appName, "letsencrypt-prod", getLetsencryptEmailProd(appName), computedEmail, LetsencryptServerProd)
|
||||
case "stag", "staging":
|
||||
computedEmail := getComputedLetsencryptEmailStag(appName)
|
||||
tlsEnabled = computedEmail != ""
|
||||
issuerKind, issuerName, appIssuer = resolveLetsencryptIssuer(appName, "letsencrypt-stag", getLetsencryptEmailStag(appName), computedEmail, LetsencryptServerStag)
|
||||
case "false":
|
||||
issuerName = ""
|
||||
tlsEnabled = false
|
||||
default:
|
||||
return result, fmt.Errorf("Invalid letsencrypt server config: %s", server)
|
||||
}
|
||||
tlsConfig, err := resolveAppTLSConfig(ResolveAppTLSConfigInput{
|
||||
AppName: appName,
|
||||
ImportedCertExists: importedCertExists,
|
||||
})
|
||||
if err != nil {
|
||||
return result, err
|
||||
}
|
||||
|
||||
chartDir, err := os.MkdirTemp("", "dokku-chart-")
|
||||
@@ -299,7 +277,7 @@ func BuildAppChart(ctx context.Context, appName, imageTag string, opts BuildOpti
|
||||
Type: imageSourceType,
|
||||
WorkingDir: workingDir,
|
||||
},
|
||||
Issuer: appIssuer,
|
||||
Issuer: tlsConfig.Issuer,
|
||||
Labels: globalLabels,
|
||||
Namespace: namespace,
|
||||
Network: GlobalNetwork{
|
||||
@@ -415,7 +393,7 @@ func BuildAppChart(ctx context.Context, appName, imageTag string, opts BuildOpti
|
||||
for _, domain := range domains {
|
||||
domainValues = append(domainValues, ProcessDomains{
|
||||
Name: domain,
|
||||
Slug: slug.Make(domain),
|
||||
Slug: domainSlug(domain),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -423,10 +401,10 @@ func BuildAppChart(ctx context.Context, appName, imageTag string, opts BuildOpti
|
||||
Domains: domainValues,
|
||||
PortMaps: []ProcessPortMap{},
|
||||
TLS: ProcessTls{
|
||||
Enabled: tlsEnabled,
|
||||
IssuerKind: issuerKind,
|
||||
IssuerName: issuerName,
|
||||
UseImportedCert: useImportedCert,
|
||||
Enabled: tlsConfig.Enabled,
|
||||
IssuerKind: tlsConfig.IssuerKind,
|
||||
IssuerName: tlsConfig.IssuerName,
|
||||
UseImportedCert: tlsConfig.UseImportedCert,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -449,7 +427,7 @@ func BuildAppChart(ctx context.Context, appName, imageTag string, opts BuildOpti
|
||||
for _, portMap := range processValues.Web.PortMaps {
|
||||
_, httpOk := portMaps[fmt.Sprintf("http-80-%d", portMap.ContainerPort)]
|
||||
_, httpsOk := portMaps[fmt.Sprintf("https-443-%d", portMap.ContainerPort)]
|
||||
if portMap.Scheme == "http" && !httpsOk && tlsEnabled {
|
||||
if portMap.Scheme == "http" && !httpsOk && tlsConfig.Enabled {
|
||||
processValues.Web.PortMaps = append(processValues.Web.PortMaps, ProcessPortMap{
|
||||
ContainerPort: portMap.ContainerPort,
|
||||
HostPort: 443,
|
||||
|
||||
Reference in New Issue
Block a user