gstykalin/kube-forge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support to expose via NodePort for vault, argoCD and Grafana

Browse Source
This commit is contained in:
George Stykalin
2024-04-29 10:36:30 +03:00
parent 6aac54a915
commit d78b71fb1f
6 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config.yaml
View File

@@ -140,9 +140,9 @@ modules:
grafana:
enabled: true
expose:
type: ingress
type: ingress # ingress or NodePort
domain: grafana.disk.lt.t1.cloud
node_port_http: 30007
tls:
enabled: true
@@ -155,9 +155,12 @@ modules:
argo_cd:
expose:
type: ingress
type: ingress # ingress or NodePort
domain: argocd.disk.lt.t1.cloud
node_port_http: 30005
node_port_https: 30006
tls:
enabled: true
@@ -196,7 +199,7 @@ modules:
secrets_storage:
enabled: true
expose:
type: ingress # NodePort
type: ingress # ingress or NodePort
domain: vault.disk.lt.t1.cloud
node_port: 30004
@@ -223,7 +226,7 @@ modules:
registry:
enabled: true
expose:
type: ingress # ingress or NodePort
type: ingress # ingress or nodePort
# if expose_type is "ingress"
domain: harbor.disk.lt.t1.cloud

5
kubespray/inventory/group_vars/k8s_cluster/addons.yml
View File

@@ -3585,6 +3585,7 @@ releases:
enabled: true
serviceMonitor: true
domain: &grafanaDomain grafana.disk.lt.t1.cloud
serviceNodePort: 30007
image:
repository: grafana/grafana
tag: 10.4.1
@@ -3649,7 +3650,7 @@ releases:
exporters: [otlphttp]
ingress:
enabled: true
enabled: false
accountEmail: reversstorm@gmail.com
class: nginx
annotations:
@@ -4205,7 +4206,7 @@ releases:
server.insecure: true
secret:
argocdServerAdminPassword: $2a$10$uCcC.iMBL3IXOHeIB/HSLOvB8WpZprJPA4dEmaNjU4wmDbPXxwMvK
argocdServerAdminPassword: $2a$10$AORf9Nnyuc.XVCI2XvmVFuU6mo5TMMert83XfUCjepoIZBETe9hWe
repositories:
# add default helm-repository from harbor

8
pkg/config/modules_cicd.go
View File

@@ -9,9 +9,11 @@ type Cicd struct {
Autoscaling bool `yaml:"autoscaling"`
} `yaml:"ha"`
Expose struct {
Type string `yaml:"type"`
Domain string `yaml:"domain"`
Tls struct {
Type string `yaml:"type"`
Domain string `yaml:"domain"`
NodePortHttp int `yaml:"node_port_http" env-default:"30005"`
NodePortHttps int `yaml:"node_port_https" env-default:"30006"`
Tls struct {
Enabled bool `yaml:"enabled"`
} `yaml:"tls"`
} `yaml:"expose"`

7
pkg/config/modules_observability.go
View File

@@ -136,9 +136,10 @@ type Visualization struct {
Image string `yaml:"image" env-default:"grafana/grafana"`
Tag string `yaml:"tag" env-default:"10.4.1"`
Expose struct {
Type string `yaml:"type" env-default:"ingress"`
Domain string `yaml:"domain" env-default:""`
Tls struct {
Type string `yaml:"type" env-default:"ingress"`
Domain string `yaml:"domain" env-default:""`
NodePortHttp int `yaml:"node_port_http" env-default:"30007"`
Tls struct {
Enabled bool `yaml:"enabled"`
}
} `yaml:"expose"`

7
pkg/resources/templates/helm-apps/releases/cicd/argo-cd.yml.tmpl
View File

@@ -15,7 +15,12 @@
server:
certificateSecret:
enabled: false
{{- if eq .Modules.Cicd.ArgoCd.Expose.Type "NodePort" }}
service:
type: "NodePort"
nodePortHttp: {{ .Modules.Cicd.ArgoCd.Expose.NodePortHttp }}
nodePortHttps: {{ .Modules.Cicd.ArgoCd.Expose.NodePortHttps }}
{{- end }}
{{- if .Modules.Cicd.ArgoCd.Ha.Enabled }}
{{- if .Modules.Cicd.ArgoCd.Ha.Autoscaling }}
autoscaling:

6
pkg/resources/templates/helm-apps/releases/observability/observability.yml.tmpl
View File

@@ -208,6 +208,10 @@
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Visualization.Grafana.Enabled }}
serviceMonitor: {{ .Modules.Observability.Monitoring.Enabled }}
domain: &grafanaDomain {{ .Modules.Observability.Visualization.Grafana.Expose.Domain }}
{{- if eq .Modules.Observability.Visualization.Grafana.Expose.Type "NodePort" }}
serviceNodePort: {{ .Modules.Observability.Visualization.Grafana.Expose.NodePortHttp }}
{{- end }}
image:
repository: {{ .Modules.Observability.Visualization.Grafana.Image }}
tag: {{ .Modules.Observability.Visualization.Grafana.Tag }}
@@ -281,6 +285,8 @@
ingress:
{{- if eq .Modules.Observability.Visualization.Grafana.Expose.Type "ingress" }}
enabled: true
{{- else }}
enabled: false
{{- end }}
accountEmail: {{ .Modules.Additional.CertManager.AccountEmail }}
class: {{ .Modules.Additional.Ingress.Type }}