diff --git a/deploy-templates/README.md b/deploy-templates/README.md index 8a2029e..912becc 100644 --- a/deploy-templates/README.md +++ b/deploy-templates/README.md @@ -58,6 +58,7 @@ A Helm chart for KubeRocketCI Gerrit Operator | global.openshift.deploymentType | string | `"deployments"` | Which type of kind will be deployed to Openshift (values: deployments/deploymentConfigs) | | global.platform | string | `"openshift"` | platform type that can be "kubernetes" or "openshift" | | groupMemberSyncInterval | string | `"30m"` | If not defined the exponential formula with the max value of 1hr will be used | +| image.registry | string | `"docker.io"` | Set the image registry, default to Docker Hub; can be customized to use an alternative provider | | image.repository | string | `"epamedp/gerrit-operator"` | KubeRocketCI gerrit-operator Docker image name. The released image can be found on [Dockerhub](https://hub.docker.com/r/epamedp/gerrit-operator) | | image.tag | string | `nil` | KubeRocketCI gerrit-operator Docker image tag. The released image can be found on [Dockerhub](https://hub.docker.com/r/epamedp/gerrit-operator/tags) | | imagePullPolicy | string | `"IfNotPresent"` | | diff --git a/deploy-templates/templates/gerrit_deployment/gerrit_deployment_config_openshift.yaml b/deploy-templates/templates/gerrit_deployment/gerrit_deployment_config_openshift.yaml index b7bbfab..7052a0e 100644 --- a/deploy-templates/templates/gerrit_deployment/gerrit_deployment_config_openshift.yaml +++ b/deploy-templates/templates/gerrit_deployment/gerrit_deployment_config_openshift.yaml @@ -26,9 +26,9 @@ spec: labels: app: {{ .Values.gerrit.name }} spec: - {{- if .Values.gerrit.imagePullSecrets}} + {{- if .Values.PullSecrets}} imagePullSecrets: - {{- range .Values.gerrit.imagePullSecrets }} + {{- range .Values.PullSecrets }} - {{. -}} {{- end -}} {{end}} @@ -44,7 +44,7 @@ spec: {{- with .Values.gerrit.extraEnv }} {{- toYaml . | nindent 12 }} {{- end }} - image: {{.Values.gerrit.image}}:{{.Values.gerrit.version}} + image: {{.Values.}}:{{.Values.gerrit.version}} imagePullPolicy: "{{ .Values.gerrit.imagePullPolicy }}" name: {{ .Values.gerrit.name }} ports: diff --git a/deploy-templates/templates/operator_deployment.yaml b/deploy-templates/templates/operator_deployment.yaml index 1b2e00a..d9fa179 100644 --- a/deploy-templates/templates/operator_deployment.yaml +++ b/deploy-templates/templates/operator_deployment.yaml @@ -24,7 +24,7 @@ spec: containers: - name: {{ .Values.name }} # Replace this with the built image name - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: "{{ .Values.imagePullPolicy }}" command: - {{ .Values.name }} diff --git a/deploy-templates/values.yaml b/deploy-templates/values.yaml index 87f046b..9b4b50b 100644 --- a/deploy-templates/values.yaml +++ b/deploy-templates/values.yaml @@ -23,6 +23,8 @@ nodeSelector: {} tolerations: [] affinity: {} image: + # -- Set the image registry, default to Docker Hub; can be customized to use an alternative provider + registry: "docker.io" # -- KubeRocketCI gerrit-operator Docker image name. The released image can be found on [Dockerhub](https://hub.docker.com/r/epamedp/gerrit-operator) repository: epamedp/gerrit-operator # -- if not defined then .Chart.AppVersion is used @@ -83,7 +85,7 @@ gerrit: tls: [] # - secretName: chart-example-tls # hosts: - # - gerrit-edp.example.com + # - gerrit-krci.example.com resources: limits: