feat: add ability to use ingress-nginx for routing instead of traefik
This commit is contained in:
1 parent
b35d6df67c
commit
5674a29211
7 files changed
+74
-25
No files matched your search
@@ -494,6 +494,10 @@ func getComputedImagePullSecrets(appName string) string {
|
|||||||
return imagePullSecrets
|
return imagePullSecrets
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getGlobalIngressClass() string {
|
||||||
|
return common.PropertyGetDefault("scheduler-k3s", "global", "ingress-class", DefaultIngressClass)
|
||||||
|
}
|
||||||
|
|
||||||
func getLetsencryptServer(appName string) string {
|
func getLetsencryptServer(appName string) string {
|
||||||
return common.PropertyGetDefault("scheduler-k3s", appName, "letsencrypt-server", "")
|
return common.PropertyGetDefault("scheduler-k3s", appName, "letsencrypt-server", "")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,23 +12,24 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
|
|||||||
|
|
||||||
flags := map[string]common.ReportFunc{
|
flags := map[string]common.ReportFunc{
|
||||||
"--scheduler-k3s-computed-deploy-timeout": reportComputedDeployTimeout,
|
"--scheduler-k3s-computed-deploy-timeout": reportComputedDeployTimeout,
|
||||||
|
"--scheduler-k3s-computed-image-pull-secrets": reportComputedImagePullSecrets,
|
||||||
|
"--scheduler-k3s-computed-letsencrypt-server": reportComputedLetsencryptServer,
|
||||||
|
"--scheduler-k3s-computed-namespace": reportComputedNamespace,
|
||||||
|
"--scheduler-k3s-computed-rollback-on-failure": reportComputedRollbackOnFailure,
|
||||||
"--scheduler-k3s-deploy-timeout": reportDeployTimeout,
|
"--scheduler-k3s-deploy-timeout": reportDeployTimeout,
|
||||||
"--scheduler-k3s-global-deploy-timeout": reportGlobalDeployTimeout,
|
"--scheduler-k3s-global-deploy-timeout": reportGlobalDeployTimeout,
|
||||||
"--scheduler-k3s-computed-image-pull-secrets": reportComputedImagePullSecrets,
|
|
||||||
"--scheduler-k3s-image-pull-secrets": reportImagePullSecrets,
|
|
||||||
"--scheduler-k3s-global-image-pull-secrets": reportGlobalImagePullSecrets,
|
"--scheduler-k3s-global-image-pull-secrets": reportGlobalImagePullSecrets,
|
||||||
"--scheduler-k3s-computed-letsencrypt-server": reportComputedLetsencryptServer,
|
"--scheduler-k3s-global-ingress-class": reportGlobalIngressClass,
|
||||||
"--scheduler-k3s-letsencrypt-server": reportLetsencryptServer,
|
|
||||||
"--scheduler-k3s-global-letsencrypt-server": reportGlobalLetsencryptServer,
|
|
||||||
"--scheduler-k3s-global-letsencrypt-email-prod": reportGlobalLetsencryptEmailProd,
|
"--scheduler-k3s-global-letsencrypt-email-prod": reportGlobalLetsencryptEmailProd,
|
||||||
"--scheduler-k3s-global-letsencrypt-email-stag": reportGlobalLetsencryptEmailStag,
|
"--scheduler-k3s-global-letsencrypt-email-stag": reportGlobalLetsencryptEmailStag,
|
||||||
"--scheduler-k3s-computed-namespace": reportComputedNamespace,
|
"--scheduler-k3s-global-letsencrypt-server": reportGlobalLetsencryptServer,
|
||||||
"--scheduler-k3s-namespace": reportNamespace,
|
|
||||||
"--scheduler-k3s-global-namespace": reportGlobalNamespace,
|
"--scheduler-k3s-global-namespace": reportGlobalNamespace,
|
||||||
"--scheduler-k3s-global-network-interface": reportGlobalNetworkInterface,
|
"--scheduler-k3s-global-network-interface": reportGlobalNetworkInterface,
|
||||||
"--scheduler-k3s-computed-rollback-on-failure": reportComputedRollbackOnFailure,
|
|
||||||
"--scheduler-k3s-rollback-on-failure": reportRollbackOnFailure,
|
|
||||||
"--scheduler-k3s-global-rollback-on-failure": reportGlobalRollbackOnFailure,
|
"--scheduler-k3s-global-rollback-on-failure": reportGlobalRollbackOnFailure,
|
||||||
|
"--scheduler-k3s-image-pull-secrets": reportImagePullSecrets,
|
||||||
|
"--scheduler-k3s-letsencrypt-server": reportLetsencryptServer,
|
||||||
|
"--scheduler-k3s-namespace": reportNamespace,
|
||||||
|
"--scheduler-k3s-rollback-on-failure": reportRollbackOnFailure,
|
||||||
}
|
}
|
||||||
|
|
||||||
flagKeys := []string{}
|
flagKeys := []string{}
|
||||||
@@ -66,6 +67,10 @@ func reportGlobalImagePullSecrets(appName string) string {
|
|||||||
return getGlobalImagePullSecrets()
|
return getGlobalImagePullSecrets()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func reportGlobalIngressClass(appName string) string {
|
||||||
|
return getGlobalIngressClass()
|
||||||
|
}
|
||||||
|
|
||||||
func reportComputedLetsencryptServer(appName string) string {
|
func reportComputedLetsencryptServer(appName string) string {
|
||||||
return getComputedLetsencryptServer(appName)
|
return getComputedLetsencryptServer(appName)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,22 +28,21 @@ var (
|
|||||||
GlobalProperties = map[string]bool{
|
GlobalProperties = map[string]bool{
|
||||||
"deploy-timeout": true,
|
"deploy-timeout": true,
|
||||||
"image-pull-secrets": true,
|
"image-pull-secrets": true,
|
||||||
|
"ingress-class": true,
|
||||||
"letsencrypt-server": true,
|
"letsencrypt-server": true,
|
||||||
"letsencrypt-email-prod": true,
|
"letsencrypt-email-prod": true,
|
||||||
"letsencrypt-email-stag": true,
|
"letsencrypt-email-stag": true,
|
||||||
"namespace": true,
|
"namespace": true,
|
||||||
"network-interface": true,
|
"network-interface": true,
|
||||||
"proxy": true,
|
|
||||||
"rollback-on-failure": true,
|
"rollback-on-failure": true,
|
||||||
"token": true,
|
"token": true,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
const KubeConfigPath = "/etc/rancher/k3s/k3s.yaml"
|
const DefaultIngressClass = "traefik"
|
||||||
|
|
||||||
const RegistryConfigPath = "/etc/rancher/k3s/registries.yaml"
|
|
||||||
|
|
||||||
const GlobalProcessType = "--global"
|
const GlobalProcessType = "--global"
|
||||||
|
const KubeConfigPath = "/etc/rancher/k3s/k3s.yaml"
|
||||||
|
const RegistryConfigPath = "/etc/rancher/k3s/registries.yaml"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
runtimeScheme = runtime.NewScheme()
|
runtimeScheme = runtime.NewScheme()
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ func main() {
|
|||||||
args := flag.NewFlagSet("scheduler-k3s:initialize", flag.ExitOnError)
|
args := flag.NewFlagSet("scheduler-k3s:initialize", flag.ExitOnError)
|
||||||
taintScheduling := args.Bool("taint-scheduling", false, "taint-scheduling: add a taint against scheduling app workloads")
|
taintScheduling := args.Bool("taint-scheduling", false, "taint-scheduling: add a taint against scheduling app workloads")
|
||||||
serverIP := args.String("server-ip", "", "server-ip: IP address of the dokku server node")
|
serverIP := args.String("server-ip", "", "server-ip: IP address of the dokku server node")
|
||||||
proxy := args.String("proxy", "traefik", "proxy: proxy to use for all outbound traffic")
|
ingressClass := args.String("ingress-class", "traefik", "ingress-class: ingress-class to use for all outbound traffic")
|
||||||
args.Parse(os.Args[2:])
|
args.Parse(os.Args[2:])
|
||||||
err = scheduler_k3s.CommandInitialize(*proxy, *serverIP, *taintScheduling)
|
err = scheduler_k3s.CommandInitialize(*ingressClass, *serverIP, *taintScheduling)
|
||||||
case "cluster-add":
|
case "cluster-add":
|
||||||
args := flag.NewFlagSet("scheduler-k3s:cluster-add", flag.ExitOnError)
|
args := flag.NewFlagSet("scheduler-k3s:cluster-add", flag.ExitOnError)
|
||||||
allowUknownHosts := args.Bool("insecure-allow-unknown-hosts", false, "insecure-allow-unknown-hosts: allow unknown hosts")
|
allowUknownHosts := args.Bool("insecure-allow-unknown-hosts", false, "insecure-allow-unknown-hosts: allow unknown hosts")
|
||||||
|
|||||||
@@ -59,9 +59,9 @@ func CommandAnnotationsSet(appName string, processType string, resourceType stri
|
|||||||
}
|
}
|
||||||
|
|
||||||
// CommandInitialize initializes a k3s cluster on the local server
|
// CommandInitialize initializes a k3s cluster on the local server
|
||||||
func CommandInitialize(proxy string, serverIP string, taintScheduling bool) error {
|
func CommandInitialize(ingressClass string, serverIP string, taintScheduling bool) error {
|
||||||
if proxy != "nginx" && proxy != "traefik" {
|
if ingressClass != "nginx" && ingressClass != "traefik" {
|
||||||
return fmt.Errorf("Invalid proxy: %s", proxy)
|
return fmt.Errorf("Invalid ingress-class: %s", ingressClass)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := isK3sInstalled(); err == nil {
|
if err := isK3sInstalled(); err == nil {
|
||||||
@@ -223,8 +223,8 @@ func CommandInitialize(proxy string, serverIP string, taintScheduling bool) erro
|
|||||||
args = append(args, "--node-taint", "CriticalAddonsOnly=true:NoSchedule")
|
args = append(args, "--node-taint", "CriticalAddonsOnly=true:NoSchedule")
|
||||||
}
|
}
|
||||||
|
|
||||||
common.CommandPropertySet("scheduler-k3s", "--global", "proxy", proxy, DefaultProperties, GlobalProperties)
|
common.CommandPropertySet("scheduler-k3s", "--global", "ingress-class", ingressClass, DefaultProperties, GlobalProperties)
|
||||||
if proxy == "nginx" {
|
if ingressClass == "nginx" {
|
||||||
args = append(args, "--disable", "traefik")
|
args = append(args, "--disable", "traefik")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -308,11 +308,11 @@ func CommandInitialize(proxy string, serverIP string, taintScheduling bool) erro
|
|||||||
|
|
||||||
common.LogInfo2Quiet("Installing helm charts")
|
common.LogInfo2Quiet("Installing helm charts")
|
||||||
err = installHelmCharts(ctx, clientset, func(chart HelmChart) bool {
|
err = installHelmCharts(ctx, clientset, func(chart HelmChart) bool {
|
||||||
if chart.ChartPath == "traefik" && proxy == "nginx" {
|
if chart.ChartPath == "traefik" && ingressClass == "nginx" {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
if chart.ChartPath == "nginx" && proxy == "traefik" {
|
if chart.ChartPath == "nginx" && ingressClass == "traefik" {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
{{- $processName := "PROCESS_NAME" }}
|
||||||
|
{{- $config := .Values.processes.PROCESS_NAME }}
|
||||||
|
{{- if and $config.web.domains (eq $.Values.global.network.ingress_class "nginx") }}
|
||||||
|
{{- range $pdx, $port_map := $config.web.port_maps }}
|
||||||
|
---
|
||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
kind: Ingress
|
||||||
|
metadata:
|
||||||
|
annotations:
|
||||||
|
dokku.com/managed: "true"
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/instance: {{ $.Values.global.app_name }}-{{ $processName }}
|
||||||
|
app.kubernetes.io/name: {{ $processName }}
|
||||||
|
app.kubernetes.io/part-of: {{ $.Values.global.app_name }}
|
||||||
|
name: {{ $.Values.global.app_name }}-{{ $processName }}-{{ $port_map.name }}
|
||||||
|
namespace: {{ $.Values.global.namespace }}
|
||||||
|
spec:
|
||||||
|
ingressClassName: nginx
|
||||||
|
{{- if and $config.web.tls.enabled (eq $port_map.scheme "https") }}
|
||||||
|
tls:
|
||||||
|
- hosts:
|
||||||
|
{{- range $ddx, $domain := $config.web.domains }}
|
||||||
|
- {{ $domain | quote }}
|
||||||
|
{{- end }}
|
||||||
|
secretName: tls-{{ $.Values.global.app_name }}-{{ $processName }}
|
||||||
|
{{- end }}
|
||||||
|
rules:
|
||||||
|
{{- range $ddx, $domain := $config.web.domains }}
|
||||||
|
- host: {{ $domain | quote }}
|
||||||
|
http:
|
||||||
|
paths:
|
||||||
|
- backend:
|
||||||
|
service:
|
||||||
|
name: {{ $.Values.global.app_name }}-{{ $processName }}
|
||||||
|
port:
|
||||||
|
name: {{ $port_map.name }}
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
path: /
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
@@ -351,7 +351,7 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
|
|||||||
},
|
},
|
||||||
Namespace: namespace,
|
Namespace: namespace,
|
||||||
Network: GlobalNetwork{
|
Network: GlobalNetwork{
|
||||||
IngressClass: "traefik",
|
IngressClass: common.PropertyGetDefault("scheduler-k3s", "--global", "ingress-class", DefaultIngressClass),
|
||||||
PrimaryPort: primaryPort,
|
PrimaryPort: primaryPort,
|
||||||
},
|
},
|
||||||
Secrets: map[string]string{},
|
Secrets: map[string]string{},
|
||||||
@@ -439,7 +439,7 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e
|
|||||||
|
|
||||||
templateFiles := []string{"deployment"}
|
templateFiles := []string{"deployment"}
|
||||||
if processType == "web" {
|
if processType == "web" {
|
||||||
templateFiles = append(templateFiles, "service", "certificate", "ingress-route", "https-redirect-middleware")
|
templateFiles = append(templateFiles, "service", "certificate", "ingress", "ingress-route", "https-redirect-middleware")
|
||||||
}
|
}
|
||||||
for _, templateName := range templateFiles {
|
for _, templateName := range templateFiles {
|
||||||
b, err := templates.ReadFile(fmt.Sprintf("templates/chart/%s.yaml", templateName))
|
b, err := templates.ReadFile(fmt.Sprintf("templates/chart/%s.yaml", templateName))
|
||||||
|
|||||||
Reference in new issue
Block a user