move cert-manager and ingress-nginx from kubespray to separate modules, remove reset action and update observability template

This commit is contained in:
2024-04-28 00:25:30 +03:00
parent 6804fe3482
commit 6aac54a915
18 changed files with 4606 additions and 92 deletions

View File

@@ -2,18 +2,32 @@ package config
type Additional struct {
CertManager struct {
Install bool `yaml:"install"`
Enabled bool `yaml:"enabled"`
HaEnabled bool `yaml:"ha_enabled"`
DnsServers []string `yaml:"dns_servers" env-default:"[8.8.8.8,1.1.1.1]"`
AccountEmail string `yaml:"account_email"`
Controller struct {
Image string `yaml:"image" env-default:"quay.io/jetstack/cert-manager-controller"`
Tag string `yaml:"tag" env-default:"v1.14.5"`
} `yaml:"controller"`
} `yaml:"cert_manager"`
Ingress struct {
Type string `yaml:"type" env-default:"nginx"`
Install bool `yaml:"install" env-default:"false"`
InsecurePort int `yaml:"insecure_port" env-default:"80"`
SecurePort int `yaml:"secure_port" env-default:"443"`
IngressClassName string `yaml:"ingress_class_name" env-default:"nginx"`
HostNetwork string `yaml:"host_network" env-default:"false"`
Type string `yaml:"type" env-default:"nginx"`
Enabled bool `yaml:"enabled"`
IngressClassName string `yaml:"ingress_class_name" env-default:"nginx"`
HostNetwork bool `yaml:"host_network"`
EnableAdmissionWebhooks bool `yaml:"enable_admission_webhooks"`
Nginx struct {
Controller struct {
Image string `yaml:"image" env-default:"registry.k8s.io/ingress-nginx/controller"`
Tag string `yaml:"tag" env-default:"v1.9.4"`
} `yaml:"controller"`
DefaultBackend struct {
Image string `yaml:"image" env-default:"registry.k8s.io/defaultbackend-amd64"`
Tag string `yaml:"tag" env-default:"1.5"`
} `yaml:"default_backend"`
} `yaml:"nginx"`
} `yaml:"ingress"`
LoadBalancer struct {

View File

@@ -104,17 +104,18 @@ type Monitoring struct {
} `yaml:"operator"`
} `yaml:"prometheus"`
AlertManager struct {
Enabled bool `yaml:"enabled"`
Image string `yaml:"image" env-default:"prom/alertmanager"`
Tag string `yaml:"tag" env-default:"v0.26.0"`
Route interface{} `yaml:"route"`
Receivers interface{} `yaml:"receivers"`
Enabled bool `yaml:"enabled"`
Image string `yaml:"image" env-default:"prom/alertmanager"`
Tag string `yaml:"tag" env-default:"v0.26.0"`
AdditionalMessageTemplates interface{} `yaml:"additionalMessageTemplates"`
Route interface{} `yaml:"route"`
Receivers interface{} `yaml:"receivers"`
} `yaml:"alert_manager"`
Blackbox struct {
Enabled bool `yaml:"enabled"`
Image string `yaml:"image" env-default:"prom/blackbox-exporter"`
Tag string `yaml:"tag" env-default:"v0.24.0"`
additionalModules string `yaml:"routes" env-default:""`
AdditionalModules string `yaml:"routes" env-default:""`
} `yaml:"blackbox"`
KubeState struct {
Enabled bool `yaml:"enabled"`

View File

@@ -21,7 +21,7 @@ type Orchestrator struct {
PingAccessIp bool `yaml:"ping_access_ip" env-default:"true"`
AutoRenewCertificates bool `yaml:"auto_renew_certificates" env-default:"false"`
EventTtl string `yaml:"event_ttl" env-default:"1h0m0s"`
PodSecurotyPolicyEnabled bool `yaml:"pod_security_policy_enabled" env-default:"false"`
PodSecurityPolicyEnabled bool `yaml:"pod_security_policy_enabled" env-default:"false"`
Network struct {
Plugin string `yaml:"plugin" env-default:"calico"`