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

update configuration and example config

Browse Source
This commit is contained in:
George Stykalin
2024-05-13 00:04:00 +03:00
parent 502552be32
commit be7ea89318
6 changed files with 23 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/config/modules_additional.go
View File

@@ -6,7 +6,7 @@ type Additional struct {
ChartVersion string `yaml:"chart_version" env-default:"v1.14.5"`
Enabled bool `yaml:"enabled"`
HaEnabled bool `yaml:"ha_enabled"`
DnsServers []string `yaml:"dns_servers" env-default:"[8.8.8.8,1.1.1.1]"`
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"`
@@ -47,7 +47,6 @@ type Additional struct {
Storage struct {
LocalPathProvisioner struct {
Enabled bool `yaml:"enabled"`
StorageClassName string `yaml:"storage_class_name" env-default:"local-path"`
ReclaimPolicy string `yaml:"reclaim_policy" env-default:"Delete"`
} `yaml:"local_path_provisioner"`

4
internal/config/modules_secrets_storage.go
View File

@@ -27,7 +27,7 @@ type SecretsStorage struct {
} `yaml:"injector"`
Server struct {
Image string `yaml:"image" env-default:"hashicorp/vault"`
Tag string `yaml:"tag" env-default:"1.15.6"`
Tag string `yaml:"tag" env-default:"1.16.0"`
Persistence struct {
DataStorage struct {
StorageClass string `yaml:"storage_class" env-default:"local-path"`
@@ -41,6 +41,6 @@ type SecretsStorage struct {
} `yaml:"server"`
Agent struct {
Image string `yaml:"image" env-default:"hashicorp/vault"`
Tag string `yaml:"tag" env-default:"1.15.6"`
Tag string `yaml:"tag" env-default:"1.16.0"`
} `yaml:"agent"`
}

14
internal/config/orchestrator.go
View File

@@ -1,12 +1,12 @@
package config
type Dns struct {
Servers []string `yaml:"servers" env-default:"[8.8.8.8,8.8.4.4]"`
DisableHostNameservers bool `yaml:"disable_host_nameservers" env-default:"false"`
Servers []string `yaml:"servers" env-default:"8.8.8.8,8.8.4.4"`
DisableHostNameservers bool `yaml:"disable_host_nameservers"`
}
type Orchestrator struct {
Version string `yaml:"version" env-default:"v1.28.0"`
Version string `yaml:"version" env-default:"v1.29.0"`
ClusterName string `yaml:"cluster_name" env-default:"k8s-cluster.local"`
BinDir string `yaml:"bin_dir" env-default:"/usr/local/bin"`
SysctlFilePath string `yaml:"sysctl_file_path" env-default:"/etc/sysctl.d/99-sysctl.conf"`
@@ -16,12 +16,12 @@ type Orchestrator struct {
ExgernalCloudProvider string `yaml:"external_cloud_provider"`
ContainerEngine struct {
Type string `yaml:"type" env-default:"containerd"`
Install bool `yaml:"install" env-default:"true"`
Install bool `yaml:"install"`
} `yaml:"container_engine"`
PingAccessIp bool `yaml:"ping_access_ip" env-default:"true"`
AutoRenewCertificates bool `yaml:"auto_renew_certificates" env-default:"false"`
PingAccessIp bool `yaml:"ping_access_ip"`
AutoRenewCertificates bool `yaml:"auto_renew_certificates"`
EventTtl string `yaml:"event_ttl" env-default:"1h0m0s"`
PodSecurityPolicyEnabled bool `yaml:"pod_security_policy_enabled" env-default:"false"`
PodSecurityPolicyEnabled bool `yaml:"pod_security_policy_enabled"`
Network struct {
Plugin string `yaml:"plugin" env-default:"calico"`

4
internal/resources/templates/helm-apps/releases/additional-modules/cert-manager.yml.tmpl
View File

@@ -290,7 +290,9 @@
# +docs:property
podDnsConfig:
nameservers:
{{- .Modules.Additional.CertManager.DnsServers | toYaml | nindent 8 }}
{{- range $index,$value := .Modules.Additional.CertManager.DnsServers }}
- "{{ $value }}"
{{- end }}
# The nodeSelector on Pods tells Kubernetes to schedule Pods on the nodes with
# matching labels.