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

update images for registry and cicd modules and add ability to set registry mirrors for orchestrator

Browse Source
This commit is contained in:
George Stykalin
2024-06-01 21:38:17 +03:00
parent 005f7bfbe9
commit cd368c7755
13 changed files with 275 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
internal/config/modules_cicd.go
View File

@@ -28,16 +28,57 @@ type Cicd struct {
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/service-ingress"`
ChartVersion string `yaml:"chart_version" env-default:"0.1.0"`
} `yaml:"service_ingress"`
Global struct {
Image string `yaml:"image" env-default:"quay.io/argoproj/argocd"`
Tag string `yaml:"tag" env-default:"latest"`
} `yaml:"global"`
Server struct {
Image string `yaml:"image" env-default:"quay.io/argoproj/argocd"`
Tag string `yaml:"tag" env-default:"latest"`
} `yaml:"server"`
Redis struct {
Image string `yaml:"image" env-default:"public.ecr.aws/docker/library/redis"`
Tag string `yaml:"tag" env-default:"7.2.4-alpine"`
Exporter struct {
Image string `yaml:"image" env-default:"public.ecr.aws/bitnami/redis-exporter"`
Tag string `yaml:"tag" env-default:"1.58.0"`
} `yaml:"exporter"`
} `yaml:"redis"`
ApplicationSet struct {
Image string `yaml:"image" env-default:"quay.io/argoproj/argocd"`
Tag string `yaml:"tag" env-default:"latest"`
} `yaml:"application_set"`
Dex struct {
Image string `yaml:"image" env-default:"ghcr.io/dexidp/dex"`
Tag string `yaml:"tag" env-default:"v2.38.0"`
} `yaml:"dex"`
RepoServer struct {
Image string `yaml:"image" env-default:"quay.io/argoproj/argocd"`
Tag string `yaml:"tag" env-default:"latest"`
} `yaml:"repo_server"`
Notifications struct {
Image string `yaml:"image" env-default:"quay.io/argoproj/argocd"`
Tag string `yaml:"tag" env-default:"latest"`
} `yaml:"notifications"`
Controller struct {
Image string `yaml:"image" env-default:"quay.io/argoproj/argocd"`
Tag string `yaml:"tag" env-default:"latest"`
} `yaml:"controller"`
} `yaml:"argo_cd"`
UpdatesOperator struct {
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/keel"`
ChartVersion string `yaml:"chart_version" env-default:"1.0.3"`
Enabled bool `yaml:"enabled"`
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/keelhq/keel"`
Tag string `yaml:"tag" env-default:"latest"`
} `yaml:"updates_operator"`
Rollouts struct {
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/argo-rollouts"`
ChartVersion string `yaml:"chart_version" env-default:"2.35.1"`
Enabled bool `yaml:"enabled"`
Registry string `yaml:"registry" env-default:"quay.io"`
Repository string `yaml:"repository" env-default:"argoproj/argo-rollouts"`
Tag string `yaml:"tag" env-default:"latest"`
Ha struct {
Enabled bool `yaml:"enabled"`
} `yaml:"ha"`

35
internal/config/modules_registry.go
View File

@@ -6,7 +6,6 @@ type Registry struct {
Enabled bool `yaml:"enabled"`
AdminPassword string
Namespace string `yaml:"namespace" env-default:"registry"`
Version string `yaml:"version" env-default:"v2.10.1"`
Expose struct {
Type string `yaml:"type" env-default:"nodePort"`
Domain string `yaml:"domain" env-default:""`
@@ -30,4 +29,38 @@ type Registry struct {
TrivySize string `yaml:"trivy_size" env-default:"5Gi"`
} `yaml:"persistence"`
EnabledScanner bool `yaml:"enabled_scanner"`
Portal struct {
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/goharbor/harbor-portal"`
Tag string `yaml:"tag" env-default:"v2.10.1"`
} `yaml:"portal"`
Core struct {
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/goharbor/harbor-core"`
Tag string `yaml:"tag" env-default:"v2.10.1"`
} `yaml:"core"`
Jobservice struct {
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/goharbor/harbor-jobservice"`
Tag string `yaml:"tag" env-default:"v2.10.1"`
} `yaml:"jobservice"`
Registry struct {
Registry struct {
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/goharbor/registry-photon"`
Tag string `yaml:"tag" env-default:"v2.10.1"`
} `yaml:"registry"`
Controller struct {
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/goharbor/harbor-registryctl"`
Tag string `yaml:"tag" env-default:"v2.10.1"`
} `yaml:"controller"`
} `yaml:"registry"`
Trivy struct {
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/goharbor/trivy-adapter-photon"`
Tag string `yaml:"tag" env-default:"v2.10.1"`
} `yaml:"trivy"`
Database struct {
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/goharbor/harbor-db"`
Tag string `yaml:"tag" env-default:"v2.10.1"`
} `yaml:"database"`
Redis struct {
Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/goharbor/redis-photon"`
Tag string `yaml:"tag" env-default:"v2.10.1"`
} `yaml:"redis"`
}

6
internal/config/orchestrator.go
View File

@@ -5,6 +5,11 @@ type Dns struct {
DisableHostNameservers bool `yaml:"disable_host_nameservers"`
}
type RegistryMirror struct {
Host string `yaml:"host"`
SkipVerify bool `yaml:"skip_verify"`
}
type Orchestrator struct {
Version string `yaml:"version" env-default:"v1.29.0"`
ClusterName string `yaml:"cluster_name" env-default:"k8s-cluster.local"`
@@ -28,4 +33,5 @@ type Orchestrator struct {
ServiceAddresses string `yaml:"service_addresses" env-default:"10.233.0.0/18"`
PodsSubnet string `yaml:"pods_subnet" env-default:"10.233.64.0/18"`
} `yaml:"network"`
RegistryMirrors []RegistryMirror `yaml:"registry_mirrors"`
}

30
internal/resources/templates/helm-apps/releases/cicd/argo-cd.yml.tmpl
View File

@@ -12,7 +12,14 @@
crds:
install: true
global:
repository: {{ .Modules.Cicd.ArgoCd.Global.Image }}
tag: {{ .Modules.Cicd.ArgoCd.Global.Tag }}
server:
image:
repository: {{ .Modules.Cicd.ArgoCd.Server.Image }}
tag: {{ .Modules.Cicd.ArgoCd.Server.Tag }}
certificateSecret:
enabled: false
{{- if eq .Modules.Cicd.ArgoCd.Expose.Type "NodePort" }}
@@ -37,12 +44,23 @@
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
redis:
image:
repository: {{ .Modules.Cicd.ArgoCd.Redis.Image }}
tag: {{ .Modules.Cicd.ArgoCd.Redis.Tag }}
exporter:
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
image:
repository: {{ .Modules.Cicd.ArgoCd.Redis.Exporter.Image }}
tag: {{ .Modules.Cicd.ArgoCd.Redis.Exporter.Tag }}
metrics:
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
serviceMonitor:
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
controller:
image:
repository: {{ .Modules.Cicd.ArgoCd.Controller.Image }}
tag: {{ .Modules.Cicd.ArgoCd.Controller.Tag }}
replicas: 1
metrics:
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
@@ -50,6 +68,9 @@
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
applicationSet:
image:
repository: {{ .Modules.Cicd.ArgoCd.ApplicationSet.Image }}
tag: {{ .Modules.Cicd.ArgoCd.ApplicationSet.Tag }}
{{- if .Modules.Cicd.ArgoCd.Ha.Enabled }}
replicas: 2
{{- end }}
@@ -59,6 +80,9 @@
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
dex:
image:
repository: {{ .Modules.Cicd.ArgoCd.Dex.Image }}
tag: {{ .Modules.Cicd.ArgoCd.Dex.Tag }}
metrics:
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
## check later
@@ -66,6 +90,9 @@
enabled: false
repoServer:
image:
repository: {{ .Modules.Cicd.ArgoCd.RepoServer.Image }}
tag: {{ .Modules.Cicd.ArgoCd.RepoServer.Tag }}
{{- if .Modules.Cicd.ArgoCd.Ha.Enabled }}
{{- if .Modules.Cicd.ArgoCd.Ha.Autoscaling }}
autoscaling:
@@ -81,6 +108,9 @@
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
notifications:
image:
repository: {{ .Modules.Cicd.ArgoCd.Notifications.Image }}
tag: {{ .Modules.Cicd.ArgoCd.Notifications.Tag }}
metrics:
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
serviceMonitor:

6
internal/resources/templates/helm-apps/releases/cicd/argo-rollouts.yml.tmpl
View File

@@ -77,11 +77,11 @@
{{- end }}
image:
# -- Registry to use
registry: quay.io
registry: {{ .Modules.Cicd.Rollouts.Registry }}
# -- Repository to use
repository: argoproj/argo-rollouts
repository: {{ .Modules.Cicd.Rollouts.Repository }}
# -- Overrides the image tag (default is the chart appVersion)
tag: ""
tag: {{ .Modules.Cicd.Rollouts.Tag }}
# -- Image pull policy
pullPolicy: IfNotPresent

4
internal/resources/templates/helm-apps/releases/cicd/keel.yml.tmpl
View File

@@ -9,8 +9,8 @@
{{- end }}
values:
image:
repository: keelhq/keel
tag: null
repository: {{ .Modules.Cicd.UpdatesOperator.Image }}
tag: {{ .Modules.Cicd.UpdatesOperator.Tag }}
pullPolicy: Always
# Enable insecure registries

32
internal/resources/templates/helm-apps/releases/registry/harbor.yml.tmpl
View File

@@ -134,8 +134,8 @@
portal:
image:
repository: harbor.kvazaric.ru/kube-forge/harbor-portal
tag: {{ .Modules.Registry.Version }}
repository: {{ .Modules.Registry.Portal.Image }}
tag: {{ .Modules.Registry.Portal.Tag }}
serviceAccountName: ""
automountServiceAccountToken: false
replicas: 1
@@ -149,8 +149,8 @@
core:
image:
repository: goharbor/harbor-core
tag: {{ .Modules.Registry.Version }}
repository: {{ .Modules.Registry.Core.Image }}
tag: {{ .Modules.Registry.Portal.Tag }}
serviceAccountName: ""
automountServiceAccountToken: false
replicas: 1
@@ -187,8 +187,8 @@
jobservice:
image:
repository: goharbor/harbor-jobservice
tag: {{ .Modules.Registry.Version }}
repository: {{ .Modules.Registry.Jobservice.Image }}
tag: {{ .Modules.Registry.Jobservice.Tag }}
serviceAccountName: ""
automountServiceAccountToken: false
replicas: 1
@@ -216,13 +216,13 @@
registry:
registry:
image:
repository: goharbor/registry-photon
tag: {{ .Modules.Registry.Version }}
repository: {{ .Modules.Registry.Registry.Registry.Image }}
tag: {{ .Modules.Registry.Registry.Registry.Tag }}
extraEnvVars: []
controller:
image:
repository: goharbor/harbor-registryctl
tag: {{ .Modules.Registry.Version }}
repository: {{ .Modules.Registry.Registry.Controller.Image }}
tag: {{ .Modules.Registry.Registry.Controller.Tag }}
extraEnvVars: []
serviceAccountName: ""
automountServiceAccountToken: false
@@ -265,8 +265,8 @@
trivy:
enabled: {{ .Modules.Registry.EnabledScanner }}
image:
repository: goharbor/trivy-adapter-photon
tag: {{ .Modules.Registry.Version }}
repository: {{ .Modules.Registry.Trivy.Image }}
tag: {{ .Modules.Registry.Trivy.Tag }}
serviceAccountName: ""
automountServiceAccountToken: false
resources:
@@ -284,8 +284,8 @@
type: internal
internal:
image:
repository: goharbor/harbor-db
tag: {{ .Modules.Registry.Version }}
repository: {{ .Modules.Registry.Database.Image }}
tag: {{ .Modules.Registry.Database.Tag }}
serviceAccountName: ""
automountServiceAccountToken: false
livenessProbe:
@@ -343,8 +343,8 @@
type: internal
internal:
image:
repository: goharbor/redis-photon
tag: {{ .Modules.Registry.Version }}
repository: {{ .Modules.Registry.Redis.Image }}
tag: {{ .Modules.Registry.Redis.Tag }}
serviceAccountName: ""
automountServiceAccountToken: false
extraEnvVars: []

66
internal/resources/templates/kubespray/inventory/group_vars/k8s_cluster/k8s-cluster.yml.tmpl
View File

@@ -231,6 +231,72 @@ dns_domain: {{ `"{{ cluster_name }}"` }}
## Default: containerd
container_manager: {{ .Orchestrator.ContainerEngine.Type }}
{{- if .Orchestrator.RegistryMirrors }}
containerd_registries_mirrors:
- prefix: docker.io
mirrors:
{{- range $index, $registryData := .Orchestrator.RegistryMirrors }}
- host: {{ $registryData.Host }}
capabilities: ["pull", "resolve"]
skip_verify: {{ $registryData.SkipVerify }}
{{- end }}
{{- else }}
containerd_registries_mirrors:
- prefix: docker.io
mirrors:
- host: https://mirror.gcr.io
capabilities: ["pull", "resolve"]
skip_verify: false
- host: https://quay.io
capabilities: ["pull", "resolve"]
skip_verify: false
- host: https://registry.redhat.io
capabilities: ["pull", "resolve"]
skip_verify: false
{{- end }}
## CRI-O registry mirrors setup
{{- if .Orchestrator.RegistryMirrors }}
crio_registries:
- prefix: docker.io
insecure: false
blocked: false
location: registry-1.docker.io
unqualified: false
mirrors:
{{- range $index, $registryData := .Orchestrator.RegistryMirrors }}
- location: {{ $registryData.Host }}
insecure: {{ $registryData.SkipVerify }}
{{- end }}
{{- else }}
crio_registries:
- prefix: docker.io
insecure: false
blocked: false
location: registry-1.docker.io
unqualified: false
mirrors:
- location: https://mirror.gcr.io
insecure: false
- location: https://quay.io
insecure: false
- location: https://registry.redhat.io
insecure: false
{{- end }}
## Docker registry mirrors setup
{{- if .Orchestrator.RegistryMirrors }}
docker_registry_mirrors:
{{- range $index, $registryData := .Orchestrator.RegistryMirrors }}
- {{ $registryData.Host }}
{{- end }}
{{- else }}
docker_registry_mirrors:
- https://mirror.gcr.io
- https://quay.io
- https://registry.redhat.io
{{- end }}
# Additional container runtimes
kata_containers_enabled: false