diff --git a/deploy-templates/README.md b/deploy-templates/README.md index 96a5cb6b8..d4a70c0ad 100644 --- a/deploy-templates/README.md +++ b/deploy-templates/README.md @@ -65,9 +65,9 @@ A Helm chart for EDP Install | extraObjects | list | `[]` | Array of extra K8s manifests to deploy | | gerrit-operator.enabled | bool | `false` | | | global.dnsWildCard | string | `nil` | a cluster DNS wildcard name | -| global.dockerRegistry | object | `{"type":"ecr","url":".dkr.ecr..amazonaws.com"}` | Gerrit SSH node port gerritSSHPort: "22" | -| global.dockerRegistry.type | string | `"ecr"` | Define Image Registry that will to be used in Pipelines. Can be ecr (default), harbor | -| global.dockerRegistry.url | string | `".dkr.ecr..amazonaws.com"` | Docker Registry endpoint | +| global.dockerRegistry | object | `{"type":"ecr","url":".dkr.ecr..amazonaws.com/"}` | Gerrit SSH node port gerritSSHPort: "22" | +| global.dockerRegistry.type | string | `"ecr"` | Define Image Registry that will to be used in Pipelines. Can be ecr (default), harbor, dockerhub | +| global.dockerRegistry.url | string | `".dkr.ecr..amazonaws.com/"` | Docker Registry endpoint. In dockerhub case the URL must be specified in accordance with the Kaniko name convention (docker.io/) | | global.gitProvider | string | `"github"` | Can be gerrit, github or gitlab. By default: github | | global.platform | string | `"kubernetes"` | platform type that can be "kubernetes" or "openshift" | | global.version | string | `"3.6.0-SNAPSHOT"` | EDP version | diff --git a/deploy-templates/templates/external-secrets/externalsecret-regcred.yaml b/deploy-templates/templates/external-secrets/externalsecret-regcred.yaml index 1cd4a1ad8..3cf5286b5 100644 --- a/deploy-templates/templates/external-secrets/externalsecret-regcred.yaml +++ b/deploy-templates/templates/external-secrets/externalsecret-regcred.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.externalSecrets.enabled .Values.externalSecrets.manageEDPInstallSecrets (eq .Values.global.dockerRegistry.type "harbor") }} +{{- if and .Values.externalSecrets.enabled .Values.externalSecrets.manageEDPInstallSecrets (eq .Values.global.dockerRegistry.type "harbor" "dockerhub") }} {{- $secretStore := include "edp-install.secretStoreName" . }} {{- $awsSecretName := .Values.externalSecrets.manageEDPInstallSecretsName }} apiVersion: external-secrets.io/v1beta1 diff --git a/deploy-templates/values.yaml b/deploy-templates/values.yaml index e788f08bb..e8b2b5259 100644 --- a/deploy-templates/values.yaml +++ b/deploy-templates/values.yaml @@ -15,10 +15,10 @@ global: # -- Gerrit SSH node port # gerritSSHPort: "22" dockerRegistry: - # -- Define Image Registry that will to be used in Pipelines. Can be ecr (default), harbor + # -- Define Image Registry that will to be used in Pipelines. Can be ecr (default), harbor, dockerhub type: "ecr" - # -- Docker Registry endpoint - url: ".dkr.ecr..amazonaws.com" + # -- Docker Registry endpoint. In dockerhub case the URL must be specified in accordance with the Kaniko name convention (docker.io/) + url: ".dkr.ecr..amazonaws.com/" # -- AWS Region, e.g. "eu-central-1" awsRegion: