update images for registry and cicd modules and add ability to set registry mirrors for orchestrator
This commit is contained in:
@@ -5,7 +5,7 @@ variables:
|
|||||||
KANIKO_CONTEXT: ${CI_PROJECT_DIR}
|
KANIKO_CONTEXT: ${CI_PROJECT_DIR}
|
||||||
RELEASE_CLI_IMAGE: harbor.kvazaric.ru/kube-forge/release-cli:v0.18.0
|
RELEASE_CLI_IMAGE: harbor.kvazaric.ru/kube-forge/release-cli:v0.18.0
|
||||||
CICD_MULTITOOL: harbor.kvazaric.ru/postgres-tasks/cicd-multitool:2.4
|
CICD_MULTITOOL: harbor.kvazaric.ru/postgres-tasks/cicd-multitool:2.4
|
||||||
BINARY_BUILDER_IMAGE: golang:alpine
|
BINARY_BUILDER_IMAGE: harbor.kvazaric.ru/mirror/library/golang:alpine
|
||||||
|
|
||||||
PREPARE_RELEASE:
|
PREPARE_RELEASE:
|
||||||
options:
|
options:
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Install dependencies
|
## Install dependencies
|
||||||
FROM python:3.12 as deps
|
FROM harbor.kvazaric.ru/mirror/library/python:3.12 as deps
|
||||||
|
|
||||||
WORKDIR /application
|
WORKDIR /application
|
||||||
COPY ./requirements.txt ./
|
COPY ./requirements.txt ./
|
||||||
@@ -9,7 +9,7 @@ RUN apt-get update -y && \
|
|||||||
pip3 install -r requirements.txt
|
pip3 install -r requirements.txt
|
||||||
|
|
||||||
## Build executable
|
## Build executable
|
||||||
FROM golang:alpine as builder
|
FROM harbor.kvazaric.ru/mirror/library/golang:alpine as builder
|
||||||
|
|
||||||
WORKDIR /application
|
WORKDIR /application
|
||||||
COPY go.mod go.sum ./
|
COPY go.mod go.sum ./
|
||||||
|
|||||||
@@ -21,6 +21,11 @@ orchestrator:
|
|||||||
ping_access_ip: true
|
ping_access_ip: true
|
||||||
auto_renew_certificates: true
|
auto_renew_certificates: true
|
||||||
pod_security_policy_enabled: true
|
pod_security_policy_enabled: true
|
||||||
|
registry_mirrors:
|
||||||
|
- host: https://mirror.gcr.io
|
||||||
|
skip_verify: false
|
||||||
|
- host: https://quay.io
|
||||||
|
skip_verify: false
|
||||||
|
|
||||||
modules:
|
modules:
|
||||||
admin_password: changeit
|
admin_password: changeit
|
||||||
|
|||||||
@@ -28,16 +28,57 @@ type Cicd struct {
|
|||||||
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/service-ingress"`
|
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/service-ingress"`
|
||||||
ChartVersion string `yaml:"chart_version" env-default:"0.1.0"`
|
ChartVersion string `yaml:"chart_version" env-default:"0.1.0"`
|
||||||
} `yaml:"service_ingress"`
|
} `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"`
|
} `yaml:"argo_cd"`
|
||||||
UpdatesOperator struct {
|
UpdatesOperator struct {
|
||||||
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/keel"`
|
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/keel"`
|
||||||
ChartVersion string `yaml:"chart_version" env-default:"1.0.3"`
|
ChartVersion string `yaml:"chart_version" env-default:"1.0.3"`
|
||||||
Enabled bool `yaml:"enabled"`
|
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"`
|
} `yaml:"updates_operator"`
|
||||||
Rollouts struct {
|
Rollouts struct {
|
||||||
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/argo-rollouts"`
|
ChartRef string `yaml:"chart_ref" env-default:"kube-forge/argo-rollouts"`
|
||||||
ChartVersion string `yaml:"chart_version" env-default:"2.35.1"`
|
ChartVersion string `yaml:"chart_version" env-default:"2.35.1"`
|
||||||
Enabled bool `yaml:"enabled"`
|
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 {
|
Ha struct {
|
||||||
Enabled bool `yaml:"enabled"`
|
Enabled bool `yaml:"enabled"`
|
||||||
} `yaml:"ha"`
|
} `yaml:"ha"`
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ type Registry struct {
|
|||||||
Enabled bool `yaml:"enabled"`
|
Enabled bool `yaml:"enabled"`
|
||||||
AdminPassword string
|
AdminPassword string
|
||||||
Namespace string `yaml:"namespace" env-default:"registry"`
|
Namespace string `yaml:"namespace" env-default:"registry"`
|
||||||
Version string `yaml:"version" env-default:"v2.10.1"`
|
|
||||||
Expose struct {
|
Expose struct {
|
||||||
Type string `yaml:"type" env-default:"nodePort"`
|
Type string `yaml:"type" env-default:"nodePort"`
|
||||||
Domain string `yaml:"domain" env-default:""`
|
Domain string `yaml:"domain" env-default:""`
|
||||||
@@ -30,4 +29,38 @@ type Registry struct {
|
|||||||
TrivySize string `yaml:"trivy_size" env-default:"5Gi"`
|
TrivySize string `yaml:"trivy_size" env-default:"5Gi"`
|
||||||
} `yaml:"persistence"`
|
} `yaml:"persistence"`
|
||||||
EnabledScanner bool `yaml:"enabled_scanner"`
|
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"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,11 @@ type Dns struct {
|
|||||||
DisableHostNameservers bool `yaml:"disable_host_nameservers"`
|
DisableHostNameservers bool `yaml:"disable_host_nameservers"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type RegistryMirror struct {
|
||||||
|
Host string `yaml:"host"`
|
||||||
|
SkipVerify bool `yaml:"skip_verify"`
|
||||||
|
}
|
||||||
|
|
||||||
type Orchestrator struct {
|
type Orchestrator struct {
|
||||||
Version string `yaml:"version" env-default:"v1.29.0"`
|
Version string `yaml:"version" env-default:"v1.29.0"`
|
||||||
ClusterName string `yaml:"cluster_name" env-default:"k8s-cluster.local"`
|
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"`
|
ServiceAddresses string `yaml:"service_addresses" env-default:"10.233.0.0/18"`
|
||||||
PodsSubnet string `yaml:"pods_subnet" env-default:"10.233.64.0/18"`
|
PodsSubnet string `yaml:"pods_subnet" env-default:"10.233.64.0/18"`
|
||||||
} `yaml:"network"`
|
} `yaml:"network"`
|
||||||
|
RegistryMirrors []RegistryMirror `yaml:"registry_mirrors"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,14 @@
|
|||||||
crds:
|
crds:
|
||||||
install: true
|
install: true
|
||||||
|
|
||||||
|
global:
|
||||||
|
repository: {{ .Modules.Cicd.ArgoCd.Global.Image }}
|
||||||
|
tag: {{ .Modules.Cicd.ArgoCd.Global.Tag }}
|
||||||
|
|
||||||
server:
|
server:
|
||||||
|
image:
|
||||||
|
repository: {{ .Modules.Cicd.ArgoCd.Server.Image }}
|
||||||
|
tag: {{ .Modules.Cicd.ArgoCd.Server.Tag }}
|
||||||
certificateSecret:
|
certificateSecret:
|
||||||
enabled: false
|
enabled: false
|
||||||
{{- if eq .Modules.Cicd.ArgoCd.Expose.Type "NodePort" }}
|
{{- if eq .Modules.Cicd.ArgoCd.Expose.Type "NodePort" }}
|
||||||
@@ -37,12 +44,23 @@
|
|||||||
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
||||||
|
|
||||||
redis:
|
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:
|
metrics:
|
||||||
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
||||||
serviceMonitor:
|
serviceMonitor:
|
||||||
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
||||||
|
|
||||||
controller:
|
controller:
|
||||||
|
image:
|
||||||
|
repository: {{ .Modules.Cicd.ArgoCd.Controller.Image }}
|
||||||
|
tag: {{ .Modules.Cicd.ArgoCd.Controller.Tag }}
|
||||||
replicas: 1
|
replicas: 1
|
||||||
metrics:
|
metrics:
|
||||||
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
||||||
@@ -50,6 +68,9 @@
|
|||||||
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
||||||
|
|
||||||
applicationSet:
|
applicationSet:
|
||||||
|
image:
|
||||||
|
repository: {{ .Modules.Cicd.ArgoCd.ApplicationSet.Image }}
|
||||||
|
tag: {{ .Modules.Cicd.ArgoCd.ApplicationSet.Tag }}
|
||||||
{{- if .Modules.Cicd.ArgoCd.Ha.Enabled }}
|
{{- if .Modules.Cicd.ArgoCd.Ha.Enabled }}
|
||||||
replicas: 2
|
replicas: 2
|
||||||
{{- end }}
|
{{- end }}
|
||||||
@@ -59,6 +80,9 @@
|
|||||||
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
||||||
|
|
||||||
dex:
|
dex:
|
||||||
|
image:
|
||||||
|
repository: {{ .Modules.Cicd.ArgoCd.Dex.Image }}
|
||||||
|
tag: {{ .Modules.Cicd.ArgoCd.Dex.Tag }}
|
||||||
metrics:
|
metrics:
|
||||||
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
||||||
## check later
|
## check later
|
||||||
@@ -66,6 +90,9 @@
|
|||||||
enabled: false
|
enabled: false
|
||||||
|
|
||||||
repoServer:
|
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.Enabled }}
|
||||||
{{- if .Modules.Cicd.ArgoCd.Ha.Autoscaling }}
|
{{- if .Modules.Cicd.ArgoCd.Ha.Autoscaling }}
|
||||||
autoscaling:
|
autoscaling:
|
||||||
@@ -81,6 +108,9 @@
|
|||||||
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
|
image:
|
||||||
|
repository: {{ .Modules.Cicd.ArgoCd.Notifications.Image }}
|
||||||
|
tag: {{ .Modules.Cicd.ArgoCd.Notifications.Tag }}
|
||||||
metrics:
|
metrics:
|
||||||
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
|
||||||
serviceMonitor:
|
serviceMonitor:
|
||||||
|
|||||||
@@ -77,11 +77,11 @@
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
image:
|
image:
|
||||||
# -- Registry to use
|
# -- Registry to use
|
||||||
registry: quay.io
|
registry: {{ .Modules.Cicd.Rollouts.Registry }}
|
||||||
# -- Repository to use
|
# -- Repository to use
|
||||||
repository: argoproj/argo-rollouts
|
repository: {{ .Modules.Cicd.Rollouts.Repository }}
|
||||||
# -- Overrides the image tag (default is the chart appVersion)
|
# -- Overrides the image tag (default is the chart appVersion)
|
||||||
tag: ""
|
tag: {{ .Modules.Cicd.Rollouts.Tag }}
|
||||||
# -- Image pull policy
|
# -- Image pull policy
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
|
|
||||||
|
|||||||
@@ -9,8 +9,8 @@
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
values:
|
values:
|
||||||
image:
|
image:
|
||||||
repository: keelhq/keel
|
repository: {{ .Modules.Cicd.UpdatesOperator.Image }}
|
||||||
tag: null
|
tag: {{ .Modules.Cicd.UpdatesOperator.Tag }}
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
|
|
||||||
# Enable insecure registries
|
# Enable insecure registries
|
||||||
|
|||||||
@@ -134,8 +134,8 @@
|
|||||||
|
|
||||||
portal:
|
portal:
|
||||||
image:
|
image:
|
||||||
repository: harbor.kvazaric.ru/kube-forge/harbor-portal
|
repository: {{ .Modules.Registry.Portal.Image }}
|
||||||
tag: {{ .Modules.Registry.Version }}
|
tag: {{ .Modules.Registry.Portal.Tag }}
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
replicas: 1
|
replicas: 1
|
||||||
@@ -149,8 +149,8 @@
|
|||||||
|
|
||||||
core:
|
core:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-core
|
repository: {{ .Modules.Registry.Core.Image }}
|
||||||
tag: {{ .Modules.Registry.Version }}
|
tag: {{ .Modules.Registry.Portal.Tag }}
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
replicas: 1
|
replicas: 1
|
||||||
@@ -187,8 +187,8 @@
|
|||||||
|
|
||||||
jobservice:
|
jobservice:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-jobservice
|
repository: {{ .Modules.Registry.Jobservice.Image }}
|
||||||
tag: {{ .Modules.Registry.Version }}
|
tag: {{ .Modules.Registry.Jobservice.Tag }}
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
replicas: 1
|
replicas: 1
|
||||||
@@ -216,13 +216,13 @@
|
|||||||
registry:
|
registry:
|
||||||
registry:
|
registry:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/registry-photon
|
repository: {{ .Modules.Registry.Registry.Registry.Image }}
|
||||||
tag: {{ .Modules.Registry.Version }}
|
tag: {{ .Modules.Registry.Registry.Registry.Tag }}
|
||||||
extraEnvVars: []
|
extraEnvVars: []
|
||||||
controller:
|
controller:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-registryctl
|
repository: {{ .Modules.Registry.Registry.Controller.Image }}
|
||||||
tag: {{ .Modules.Registry.Version }}
|
tag: {{ .Modules.Registry.Registry.Controller.Tag }}
|
||||||
extraEnvVars: []
|
extraEnvVars: []
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
@@ -265,8 +265,8 @@
|
|||||||
trivy:
|
trivy:
|
||||||
enabled: {{ .Modules.Registry.EnabledScanner }}
|
enabled: {{ .Modules.Registry.EnabledScanner }}
|
||||||
image:
|
image:
|
||||||
repository: goharbor/trivy-adapter-photon
|
repository: {{ .Modules.Registry.Trivy.Image }}
|
||||||
tag: {{ .Modules.Registry.Version }}
|
tag: {{ .Modules.Registry.Trivy.Tag }}
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
resources:
|
resources:
|
||||||
@@ -284,8 +284,8 @@
|
|||||||
type: internal
|
type: internal
|
||||||
internal:
|
internal:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-db
|
repository: {{ .Modules.Registry.Database.Image }}
|
||||||
tag: {{ .Modules.Registry.Version }}
|
tag: {{ .Modules.Registry.Database.Tag }}
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
@@ -343,8 +343,8 @@
|
|||||||
type: internal
|
type: internal
|
||||||
internal:
|
internal:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/redis-photon
|
repository: {{ .Modules.Registry.Redis.Image }}
|
||||||
tag: {{ .Modules.Registry.Version }}
|
tag: {{ .Modules.Registry.Redis.Tag }}
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
extraEnvVars: []
|
extraEnvVars: []
|
||||||
|
|||||||
@@ -231,6 +231,72 @@ dns_domain: {{ `"{{ cluster_name }}"` }}
|
|||||||
## Default: containerd
|
## Default: containerd
|
||||||
container_manager: {{ .Orchestrator.ContainerEngine.Type }}
|
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
|
# Additional container runtimes
|
||||||
kata_containers_enabled: false
|
kata_containers_enabled: false
|
||||||
|
|
||||||
|
|||||||
@@ -4350,7 +4350,7 @@ releases:
|
|||||||
|
|
||||||
portal:
|
portal:
|
||||||
image:
|
image:
|
||||||
repository: harbor.kvazaric.ru/kube-forge/harbor-portal
|
repository: harbor.kvazaric.ru/kube-forge/goharbor/harbor-portal
|
||||||
tag: v2.10.1
|
tag: v2.10.1
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
@@ -4365,7 +4365,7 @@ releases:
|
|||||||
|
|
||||||
core:
|
core:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-core
|
repository: harbor.kvazaric.ru/kube-forge/goharbor/harbor-core
|
||||||
tag: v2.10.1
|
tag: v2.10.1
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
@@ -4403,7 +4403,7 @@ releases:
|
|||||||
|
|
||||||
jobservice:
|
jobservice:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-jobservice
|
repository: harbor.kvazaric.ru/kube-forge/goharbor/harbor-jobservice
|
||||||
tag: v2.10.1
|
tag: v2.10.1
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
@@ -4432,12 +4432,12 @@ releases:
|
|||||||
registry:
|
registry:
|
||||||
registry:
|
registry:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/registry-photon
|
repository: harbor.kvazaric.ru/kube-forge/goharbor/registry-photon
|
||||||
tag: v2.10.1
|
tag: v2.10.1
|
||||||
extraEnvVars: []
|
extraEnvVars: []
|
||||||
controller:
|
controller:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-registryctl
|
repository: harbor.kvazaric.ru/kube-forge/goharbor/harbor-registryctl
|
||||||
tag: v2.10.1
|
tag: v2.10.1
|
||||||
extraEnvVars: []
|
extraEnvVars: []
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
@@ -4481,7 +4481,7 @@ releases:
|
|||||||
trivy:
|
trivy:
|
||||||
enabled: true
|
enabled: true
|
||||||
image:
|
image:
|
||||||
repository: goharbor/trivy-adapter-photon
|
repository: harbor.kvazaric.ru/kube-forge/goharbor/trivy-adapter-photon
|
||||||
tag: v2.10.1
|
tag: v2.10.1
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
@@ -4500,7 +4500,7 @@ releases:
|
|||||||
type: internal
|
type: internal
|
||||||
internal:
|
internal:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-db
|
repository: harbor.kvazaric.ru/kube-forge/goharbor/harbor-db
|
||||||
tag: v2.10.1
|
tag: v2.10.1
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
@@ -4559,7 +4559,7 @@ releases:
|
|||||||
type: internal
|
type: internal
|
||||||
internal:
|
internal:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/redis-photon
|
repository: harbor.kvazaric.ru/kube-forge/goharbor/redis-photon
|
||||||
tag: v2.10.1
|
tag: v2.10.1
|
||||||
serviceAccountName: ""
|
serviceAccountName: ""
|
||||||
automountServiceAccountToken: false
|
automountServiceAccountToken: false
|
||||||
@@ -4607,7 +4607,14 @@ releases:
|
|||||||
crds:
|
crds:
|
||||||
install: true
|
install: true
|
||||||
|
|
||||||
|
global:
|
||||||
|
repository: quay.io/argoproj/argocd
|
||||||
|
tag: latest
|
||||||
|
|
||||||
server:
|
server:
|
||||||
|
image:
|
||||||
|
repository: quay.io/argoproj/argocd
|
||||||
|
tag: latest
|
||||||
certificateSecret:
|
certificateSecret:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|
||||||
@@ -4617,12 +4624,23 @@ releases:
|
|||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
|
image:
|
||||||
|
repository: public.ecr.aws/docker/library/redis
|
||||||
|
tag: 7.2.4-alpine
|
||||||
|
exporter:
|
||||||
|
enabled: true
|
||||||
|
image:
|
||||||
|
repository: public.ecr.aws/bitnami/redis-exporter
|
||||||
|
tag: 1.58.0
|
||||||
metrics:
|
metrics:
|
||||||
enabled: true
|
enabled: true
|
||||||
serviceMonitor:
|
serviceMonitor:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
controller:
|
controller:
|
||||||
|
image:
|
||||||
|
repository: quay.io/argoproj/argocd
|
||||||
|
tag: latest
|
||||||
replicas: 1
|
replicas: 1
|
||||||
metrics:
|
metrics:
|
||||||
enabled: true
|
enabled: true
|
||||||
@@ -4630,12 +4648,18 @@ releases:
|
|||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
applicationSet:
|
applicationSet:
|
||||||
|
image:
|
||||||
|
repository: quay.io/argoproj/argocd
|
||||||
|
tag: latest
|
||||||
metrics:
|
metrics:
|
||||||
enabled: true
|
enabled: true
|
||||||
serviceMonitor:
|
serviceMonitor:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
dex:
|
dex:
|
||||||
|
image:
|
||||||
|
repository: ghcr.io/dexidp/dex
|
||||||
|
tag: v2.38.0
|
||||||
metrics:
|
metrics:
|
||||||
enabled: true
|
enabled: true
|
||||||
## check later
|
## check later
|
||||||
@@ -4643,12 +4667,18 @@ releases:
|
|||||||
enabled: false
|
enabled: false
|
||||||
|
|
||||||
repoServer:
|
repoServer:
|
||||||
|
image:
|
||||||
|
repository: quay.io/argoproj/argocd
|
||||||
|
tag: latest
|
||||||
metrics:
|
metrics:
|
||||||
enabled: true
|
enabled: true
|
||||||
serviceMonitor:
|
serviceMonitor:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
|
image:
|
||||||
|
repository: quay.io/argoproj/argocd
|
||||||
|
tag: latest
|
||||||
metrics:
|
metrics:
|
||||||
enabled: true
|
enabled: true
|
||||||
serviceMonitor:
|
serviceMonitor:
|
||||||
@@ -4659,7 +4689,7 @@ releases:
|
|||||||
server.insecure: true
|
server.insecure: true
|
||||||
|
|
||||||
secret:
|
secret:
|
||||||
argocdServerAdminPassword: $2a$10$HDBhVHGtL0vBIcjuOybKzuTkc/HVVuQhZ0QHa38ljyjjZPmAESxrW
|
argocdServerAdminPassword: $2a$10$Nlkv3tEZauAtWk8BUbloqujTETrG7n1rlJmRXJAxz4xiZRRRtgfO6
|
||||||
|
|
||||||
repositories:
|
repositories:
|
||||||
# add default helm-repository from harbor
|
# add default helm-repository from harbor
|
||||||
@@ -4783,7 +4813,7 @@ releases:
|
|||||||
# -- Repository to use
|
# -- Repository to use
|
||||||
repository: argoproj/argo-rollouts
|
repository: argoproj/argo-rollouts
|
||||||
# -- Overrides the image tag (default is the chart appVersion)
|
# -- Overrides the image tag (default is the chart appVersion)
|
||||||
tag: ""
|
tag: latest
|
||||||
# -- Image pull policy
|
# -- Image pull policy
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
|
|
||||||
@@ -5132,8 +5162,8 @@ releases:
|
|||||||
release_state: "present"
|
release_state: "present"
|
||||||
values:
|
values:
|
||||||
image:
|
image:
|
||||||
repository: keelhq/keel
|
repository: harbor.kvazaric.ru/kube-forge/keelhq/keel
|
||||||
tag: null
|
tag: latest
|
||||||
pullPolicy: Always
|
pullPolicy: Always
|
||||||
|
|
||||||
# Enable insecure registries
|
# Enable insecure registries
|
||||||
|
|||||||
@@ -226,6 +226,33 @@ dns_domain: "{{ cluster_name }}"
|
|||||||
## docker for docker, crio for cri-o and containerd for containerd.
|
## docker for docker, crio for cri-o and containerd for containerd.
|
||||||
## Default: containerd
|
## Default: containerd
|
||||||
container_manager: containerd
|
container_manager: containerd
|
||||||
|
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
|
||||||
|
|
||||||
|
## CRI-O registry mirrors setup
|
||||||
|
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
|
||||||
|
|
||||||
|
## Docker registry mirrors setup
|
||||||
|
docker_registry_mirrors:
|
||||||
|
- https://mirror.gcr.io
|
||||||
|
- https://quay.io
|
||||||
|
|
||||||
# Additional container runtimes
|
# Additional container runtimes
|
||||||
kata_containers_enabled: false
|
kata_containers_enabled: false
|
||||||
|
|||||||
Reference in New Issue
Block a user