diff --git a/internal/config/modules_observability.go b/internal/config/modules_observability.go index bf7b112..31cb81b 100644 --- a/internal/config/modules_observability.go +++ b/internal/config/modules_observability.go @@ -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 { diff --git a/internal/config/modules_secrets_storage.go b/internal/config/modules_secrets_storage.go index 0db1329..80e7574 100644 --- a/internal/config/modules_secrets_storage.go +++ b/internal/config/modules_secrets_storage.go @@ -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"` } diff --git a/kubespray/inventory/group_vars/k8s_cluster/addons.yml b/kubespray/inventory/group_vars/k8s_cluster/addons.yml index 0afd6c2..80034f8 100644 --- a/kubespray/inventory/group_vars/k8s_cluster/addons.yml +++ b/kubespray/inventory/group_vars/k8s_cluster/addons.yml @@ -3153,7 +3153,7 @@ releases: operator: initcontainer: - repository: "docker" + repository: "harbor.kvazaric.ru/kube-forge/docker" tag: "20.10" resources: @@ -3165,7 +3165,7 @@ releases: cpu: 50m memory: 64Mi container: - repository: "kubesphere/fluent-operator" + repository: "harbor.kvazaric.ru/kube-forge/kubesphere/fluent-operator" tag: "v2.7.0" resources: limits: @@ -3196,7 +3196,7 @@ releases: mode: "agent" port: 24224 image: - repository: "kubesphere/fluentd" + repository: "harbor.kvazaric.ru/kube-forge/kubesphere/fluentd" tag: "v1.15.3" nameOverride: "" @@ -3223,7 +3223,7 @@ releases: repository: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator tag: "" collectorImage: - repository: otel/opentelemetry-collector-contrib + repository: harbor.kvazaric.ru/kube-forge/otel/opentelemetry-collector-contrib tag: 0.95.0 featureGates: "" @@ -3555,8 +3555,8 @@ releases: replicas: 1 tempo: - repository: grafana/tempo - tag: "" + repository: harbor.kvazaric.ru/kube-forge/grafana/tempo + tag: "2.3.1" pullPolicy: IfNotPresent updateStrategy: RollingUpdate @@ -3590,8 +3590,8 @@ releases: endpoint: "0.0.0.0:4318" tempoQuery: - repository: grafana/tempo-query - tag: null + repository: harbor.kvazaric.ru/kube-forge/grafana/tempo-query + tag: 2.3.1 pullPolicy: IfNotPresent enabled: true @@ -3630,9 +3630,9 @@ releases: values: loki: image: - registry: docker.io - repository: grafana/loki - tag: null + registry: harbor.kvazaric.ru + repository: kube-forge/grafana/loki + tag: latest podAnnotations: app.kubernetes.io/component: "loki" auth_enabled: false @@ -3828,7 +3828,7 @@ releases: enabled: true serviceMonitor: true image: - repository: prom/prometheus + repository: harbor.kvazaric.ru/kube-forge/prom/prometheus tag: v2.45.0 pullPolicy: IfNotPresent @@ -3923,7 +3923,7 @@ releases: serviceMonitor: true enableDefaultRules: true image: - repository: prom/alertmanager + repository: harbor.kvazaric.ru/kube-forge/prom/alertmanager tag: "v0.26.0" pullPolicy: IfNotPresent @@ -3960,7 +3960,7 @@ releases: enabled: true serviceMonitor: true image: - repository: prom/blackbox-exporter + repository: harbor.kvazaric.ru/kube-forge/prom/blackbox-exporter tag: "v0.24.0" pullPolicy: IfNotPresent @@ -3973,7 +3973,7 @@ releases: kubeStateMetrics: enabled: true image: - repository: bitnami/kube-state-metrics + repository: harbor.kvazaric.ru/kube-forge/bitnami/kube-state-metrics tag: "2.9.2" pullPolicy: IfNotPresent resources: @@ -3999,14 +3999,14 @@ releases: kubeRbacProxy: image: - repository: bitnami/kube-rbac-proxy + repository: harbor.kvazaric.ru/kube-forge/bitnami/kube-rbac-proxy tag: 0.14.1 pullPolicy: IfNotPresent nodeExporter: enabled: true image: - repository: prom/node-exporter + repository: harbor.kvazaric.ru/kube-forge/prom/node-exporter tag: v1.5.0 pullPolicy: IfNotPresent @@ -4027,7 +4027,7 @@ releases: cron: restartSchedule: "*/2 * * * *" image: - repository: bitnami/kubectl + repository: harbor.kvazaric.ru/kube-forge/bitnami/kubectl tag: 1.27.5-debian-11-r8 pullPolicy: IfNotPresent additionalRoutes: @@ -4123,7 +4123,7 @@ releases: enable: true serviceMonitor: true image: - repository: "kubesphere/fluent-bit" + repository: "harbor.kvazaric.ru/kube-forge/kubesphere/fluent-bit" tag: "v2.2.2" affinity: @@ -4659,7 +4659,7 @@ releases: server.insecure: true secret: - argocdServerAdminPassword: $2a$10$eNxOwjtN3LQI43LN955F5uaOw3/i1pIp7xes.krK0GDZiDv1SMfNi + argocdServerAdminPassword: $2a$10$HDBhVHGtL0vBIcjuOybKzuTkc/HVVuQhZ0QHa38ljyjjZPmAESxrW repositories: # add default helm-repository from harbor @@ -5462,7 +5462,7 @@ releases: # image sets the repo and tag of the vault-k8s image to use for the injector. image: - repository: "hashicorp/vault-k8s" + repository: "harbor.kvazaric.ru/kube-forge/hashicorp/vault-k8s" tag: "1.3.1" pullPolicy: IfNotPresent @@ -5470,7 +5470,7 @@ releases: # containers. This should be set to the official Vault image. Vault 1.3.1+ is # required. agentImage: - repository: "hashicorp/vault" + repository: "harbor.kvazaric.ru/kube-forge/hashicorp/vault" tag: "1.16.0" agentDefaults: cpuLimit: "500m" @@ -5697,7 +5697,7 @@ releases: secretKey: "license" image: - repository: "hashicorp/vault" + repository: "harbor.kvazaric.ru/kube-forge/hashicorp/vault" tag: "1.16.0" # Overrides the default Image Pull Policy pullPolicy: IfNotPresent @@ -6136,7 +6136,7 @@ releases: enabled: true image: - repository: "hashicorp/vault-csi-provider" + repository: "harbor.kvazaric.ru/kube-forge/hashicorp/vault-csi-provider" tag: "1.4.1" pullPolicy: IfNotPresent @@ -6186,7 +6186,7 @@ releases: extraArgs: [] image: - repository: "hashicorp/vault" + repository: "harbor.kvazaric.ru/kube-forge/hashicorp/vault" tag: "1.16.0" pullPolicy: IfNotPresent