feat: Implement integration with docker hub (#43)

Change-Id: I8a439a4f76cab4e46551b973b9ae0c78e4d93225
epam · Oct 5, 2023 · 1dd3d59 · 1dd3d59
1 parent ff979f7
commit 1dd3d59
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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":"<AWS_ACCOUNT_ID>.dkr.ecr.<AWS_REGION>.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 | `"<AWS_ACCOUNT_ID>.dkr.ecr.<AWS_REGION>.amazonaws.com"` | Docker Registry endpoint |
+| global.dockerRegistry | object | `{"type":"ecr","url":"<AWS_ACCOUNT_ID>.dkr.ecr.<AWS_REGION>.amazonaws.com/<registry_space>"}` | 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 | `"<AWS_ACCOUNT_ID>.dkr.ecr.<AWS_REGION>.amazonaws.com/<registry_space>"` | Docker Registry endpoint. In dockerhub case the URL must be specified in accordance with the Kaniko name convention (docker.io/<registry_space>) |
 | 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
@@ -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
@@ -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: "<AWS_ACCOUNT_ID>.dkr.ecr.<AWS_REGION>.amazonaws.com"
+    # -- Docker Registry endpoint. In dockerhub case the URL must be specified in accordance with the Kaniko name convention (docker.io/<registry_space>)
+    url: "<AWS_ACCOUNT_ID>.dkr.ecr.<AWS_REGION>.amazonaws.com/<registry_space>"
 
 # -- AWS Region, e.g. "eu-central-1"
 awsRegion: