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

2024-06-01 21:38:17 +03:00
parent 005f7bfbe9
commit cd368c7755
13 changed files with 275 additions and 37 deletions
--- a/internal/resources/templates/helm-apps/releases/cicd/argo-cd.yml.tmpl
+++ b/internal/resources/templates/helm-apps/releases/cicd/argo-cd.yml.tmpl
@@ -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:
--- a/internal/resources/templates/helm-apps/releases/cicd/argo-rollouts.yml.tmpl
+++ b/internal/resources/templates/helm-apps/releases/cicd/argo-rollouts.yml.tmpl
@@ -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

--- a/internal/resources/templates/helm-apps/releases/cicd/keel.yml.tmpl
+++ b/internal/resources/templates/helm-apps/releases/cicd/keel.yml.tmpl
@@ -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
--- a/internal/resources/templates/helm-apps/releases/registry/harbor.yml.tmpl
+++ b/internal/resources/templates/helm-apps/releases/registry/harbor.yml.tmpl
@@ -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: []
--- a/internal/resources/templates/kubespray/inventory/group_vars/k8s_cluster/k8s-cluster.yml.tmpl
+++ b/internal/resources/templates/kubespray/inventory/group_vars/k8s_cluster/k8s-cluster.yml.tmpl
@@ -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