Use repository for image name key in templates

In system-charts, we need to use the `repository` and `tag` to define container's image name. After that, we can collect them together and provide an images list we need for system charts.

Use repository for image name key in templates
0a1d0d47 · orangedeng · Alena Prokharchyk · a4979154 · 0a1d0d47 · 0a1d0d47
Commit 0a1d0d47 authored Feb 27, 2019 by orangedeng Committed by Alena Prokharchyk Mar 04, 2019
Showing with 3 additions and 3 deletions

README.md charts/rancher-external-dns/v0.0.1/README.md +1 -1

deployment.yaml charts/rancher-external-dns/v0.0.1/templates/deployment.yaml +1 -1

values.yaml charts/rancher-external-dns/v0.0.1/values.yaml +1 -1

No files found.
--- a/charts/rancher-external-dns/v0.0.1/README.md
+++ b/charts/rancher-external-dns/v0.0.1/README.md
@@ -47,7 +47,7 @@ The following table lists the configurable parameters of the external-dns chart 
 | `google.project`                   | When using the Google provider, specify the Google project (required when provider=google).                                | `""`                                               |
 | `google.serviceAccountSecret`      | When using the Google provider, optionally specify the existing secret which contains credentials.json if necessary.                | `""`                                               |
 | `google.serviceAccountKey`      | When using the Google provider, optionally specify the service account key JSON file. Must be provided when no existing secret is used, in this case a new secret will be created holding this service account               |  `""`                                               |
-| `image.name`                       | Container image name (Including repository name if not `hub.docker.com`).                                                  | `registry.opensource.zalan.do/teapot/external-dns` |
+| `image.repository`                  | Container image name (Including repository name if not `hub.docker.com`).                                                  | `registry.opensource.zalan.do/teapot/external-dns` |
 | `image.pullPolicy`                 | Container pull policy.                                                                                                     | `IfNotPresent`                                     |
 | `image.tag`                        | Container image tag.                                                                                                       | `v0.5.9`                                           |
 | `image.pullSecrets`                | Array of pull secret names                                                                                                 | `[]`                                               |

--- a/charts/rancher-external-dns/v0.0.1/templates/deployment.yaml
+++ b/charts/rancher-external-dns/v0.0.1/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
      {{- end }}
      containers:
        - name: {{ template "external-dns.name" . }}
-          image: {{ template "system_default_registry" . }}{{ .Values.image.name}}:{{ .Values.image.tag }}
+          image: {{ template "system_default_registry" . }}{{ .Values.image.repository}}:{{ .Values.image.tag }}
          imagePullPolicy: "{{ .Values.image.pullPolicy }}"
          args:
          {{- if .Values.logLevel }}

--- a/charts/rancher-external-dns/v0.0.1/values.yaml
+++ b/charts/rancher-external-dns/v0.0.1/values.yaml
 ## Details about the image to be pulled.
 image:
-  name: rancher/kubernetes-external-dns
+  repository: rancher/kubernetes-external-dns
  tag: v0.5.11
  pullSecrets: []
  pullPolicy: IfNotPresent