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

change default images to prevent error during installation

Browse Source
This commit is contained in:
George Stykalin
2024-06-01 18:53:42 +03:00
parent d4db0cd840
commit 005f7bfbe9
3 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
internal/config/modules_observability.go
View File

@@ -15,33 +15,33 @@ type Logging struct {
Operator struct {
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/fluent-operator"`
ChartVersion string `yaml:"chart_version" env-default:"2.7.0"`
Image string `yaml:"image" env-default:"kubesphere/fluent-operator"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/kubesphere/fluent-operator"`
Tag string `yaml:"tag" env-default:"v2.7.0"`
InitContainer struct {
Image string `yaml:"image" env-default:"docker"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/docker"`
Tag string `yaml:"tag" env-default:"20.10"`
} `yaml:"initcontainer"`
} `yaml:"operator"`
Fluentd struct {
Image string `yaml:"image" env-default:"kubesphere/fluentd"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/kubesphere/fluentd"`
Tag string `yaml:"tag" env-default:"v1.15.3"`
} `yaml:"fluentd"`
FluentBit struct {
Image string `yaml:"image" env-default:"kubesphere/fluent-bit"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/kubesphere/fluent-bit"`
Tag string `yaml:"tag" env-default:"v2.2.2"`
} `yaml:"fluent_bit"`
Loki struct {
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/loki"`
ChartVersion string `yaml:"chart_version" env-default:"5.47.2"`
Registry string `yaml:"registry" env-default:"docker.io"`
Image string `yaml:"image" env-default:"grafana/loki"`
Tag string `yaml:"tag" env-default:"null"`
Registry string `yaml:"registry" env-default:"harbor.kvazaric.ru"`
Image string `yaml:"image" env-default:"kube-forge/grafana/loki"`
Tag string `yaml:"tag" env-default:"latest"`
Persistence struct {
StorageClass string `yaml:"storage_class" env-default:"local-path"`
StorageSize string `yaml:"storage_size" env-default:"10Gi"`
Retention string `yaml:"retention" env-default:"168h"`
} `yaml:"persistence"`
AlertManagerUrl string `yaml:"alert_manager_url" env-default:"http://observability-alert-manager:9093"`
AlertManagerUrl string `yaml:"alert_manager_u rl" env-default:"http://observability-alert-manager:9093"`
AdditionalRulesGroups string `yaml:"additional_rules_groups" env-default:""`
} `yaml:"loki"`
Events struct {
@@ -51,7 +51,7 @@ type Logging struct {
Tag string `yaml:"tag" env-default:"v1.4"`
} `yaml:"exporter"`
Cron struct {
Image string `yaml:"image" env-default:"bitnami/kubectl"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/bitnami/kubectl"`
Tag string `yaml:"tag" env-default:"1.27.5-debian-11-r8"`
Schedule string `yaml:"schedule" env-default:"*/2 * * * *"`
} `yaml:"cron"`
@@ -67,14 +67,14 @@ type Tracing struct {
Tag string `yaml:"tag" env-default:""`
} `yaml:"operator"`
Collector struct {
Image string `yaml:"image" env-default:"otel/opentelemetry-collector-contrib"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/otel/opentelemetry-collector-contrib"`
Tag string `yaml:"tag" env-default:"0.95.0"`
} `yaml:"collector"`
Tempo struct {
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/tempo"`
ChartVersion string `yaml:"chart_version" env-default:"1.7.2"`
Image string `yaml:"image" env-default:"grafana/tempo"`
Tag string `yaml:"tag" env-default:""`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/grafana/tempo"`
Tag string `yaml:"tag" env-default:"2.3.1"`
Retention string `yaml:"retention" env-default:"24h"`
ListenPort int `yaml:"listen_port" env-default:"3100"`
Persistence struct {
@@ -82,8 +82,8 @@ type Tracing struct {
StorageSize string `yaml:"storage_size" env-default:"10Gi"`
} `yaml:"persistence"`
TempoQuery struct {
Image string `yaml:"image" env-default:"grafana/tempo-query"`
Tag string `yaml:"tag" env-default:"null"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/grafana/tempo-query"`
Tag string `yaml:"tag" env-default:"2.3.1"`
ListenPort int `yaml:"listen_port" env-default:"16686"`
} `yaml:"tempo_query"`
} `yaml:"tempo"`
@@ -92,7 +92,7 @@ type Tracing struct {
type Monitoring struct {
Enabled bool `yaml:"enabled"`
Prometheus struct {
Image string `yaml:"image" env-default:"prom/prometheus"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/prom/prometheus"`
Tag string `yaml:"tag" env-default:"v2.45.0"`
ScrapeInterval string `yaml:"scrape_interval" env-default:"15s"`
Persistence struct {
@@ -108,14 +108,14 @@ type Monitoring struct {
Tag string `yaml:"tag" env-default:"v0.65.2"`
} `yaml:"config_reloader"`
KubeRbacProxy struct {
Image string `yaml:"image" env-default:"bitnami/kube-rbac-proxy"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/bitnami/kube-rbac-proxy"`
Tag string `yaml:"tag" env-default:"0.14.1"`
} `yaml:"kube_rbac_proxy"`
} `yaml:"operator"`
} `yaml:"prometheus"`
AlertManager struct {
Enabled bool `yaml:"enabled"`
Image string `yaml:"image" env-default:"prom/alertmanager"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/prom/alertmanager"`
Tag string `yaml:"tag" env-default:"v0.26.0"`
AdditionalMessageTemplates interface{} `yaml:"additionalMessageTemplates"`
Route interface{} `yaml:"route"`
@@ -123,18 +123,18 @@ type Monitoring struct {
} `yaml:"alert_manager"`
Blackbox struct {
Enabled bool `yaml:"enabled"`
Image string `yaml:"image" env-default:"prom/blackbox-exporter"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/prom/blackbox-exporter"`
Tag string `yaml:"tag" env-default:"v0.24.0"`
AdditionalModules string `yaml:"routes" env-default:""`
} `yaml:"blackbox"`
KubeState struct {
Enabled bool `yaml:"enabled"`
Image string `yaml:"image" env-default:"bitnami/kube-state-metrics"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/bitnami/kube-state-metrics"`
Tag string `yaml:"tag" env-default:"2.9.2"`
} `yaml:"kube_state"`
Node struct {
Enabled bool `yaml:"enabled"`
Image string `yaml:"image" env-default:"prom/node-exporter"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/prom/node-exporter"`
Tag string `yaml:"tag" env-default:"v1.5.0"`
} `yaml:"node"`
MetricsServer struct {

8
internal/config/modules_secrets_storage.go
View File

@@ -19,15 +19,15 @@ type SecretsStorage struct {
} `yaml:"expose"`
CsiIntegration struct {
Enabled bool `yaml:"enabled"`
Image string `yaml:"image" env-default:"hashicorp/vault-csi-provider"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/hashicorp/vault-csi-provider"`
Tag string `yaml:"tag" env-default:"1.4.1"`
} `yaml:"csi_integration"`
Injector struct {
Image string `yaml:"image" env-default:"hashicorp/vault-k8s"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/hashicorp/vault-k8s"`
Tag string `yaml:"tag" env-default:"1.3.1"`
} `yaml:"injector"`
Server struct {
Image string `yaml:"image" env-default:"hashicorp/vault"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/hashicorp/vault"`
Tag string `yaml:"tag" env-default:"1.16.0"`
Persistence struct {
DataStorage struct {
@@ -41,7 +41,7 @@ type SecretsStorage struct {
} `yaml:"persistence"`
} `yaml:"server"`
Agent struct {
Image string `yaml:"image" env-default:"hashicorp/vault"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/hashicorp/vault"`
Tag string `yaml:"tag" env-default:"1.16.0"`
} `yaml:"agent"`
}