diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-11-24 16:48:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-24 16:48:12 +0000 |
| commit | 6adcaae69b01452140e20d6bf76c8cc5e17fd2c5 (patch) | |
| tree | 5eceb3f639755ad29f7e2383a0d665a587ad6a85 | |
| parent | 7a38605ba0010f599e7b865e9403f9e87466a2bf (diff) | |
| parent | c9f5533d785919efa9c6dcfc74d7162bef5943eb (diff) | |
Merge "[COMMON][ETCD] Uses new tpls for repos / images"
| -rw-r--r-- | kubernetes/common/etcd/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/common/etcd/templates/statefulset.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/common/etcd/values.yaml | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/kubernetes/common/etcd/requirements.yaml b/kubernetes/common/etcd/requirements.yaml index e90e615d73..733bc449cb 100644 --- a/kubernetes/common/etcd/requirements.yaml +++ b/kubernetes/common/etcd/requirements.yaml @@ -16,3 +16,6 @@ dependencies: - name: common version: ~6.x-0 repository: 'file://../common' + - name: repositoryGenerator + version: ~6.x-0 + repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/etcd/templates/statefulset.yaml b/kubernetes/common/etcd/templates/statefulset.yaml index c45648f757..f5592bd252 100644 --- a/kubernetes/common/etcd/templates/statefulset.yaml +++ b/kubernetes/common/etcd/templates/statefulset.yaml @@ -50,7 +50,7 @@ spec: {{- end }} containers: - name: {{ include "common.fullname" . }} - image: "{{ .Values.repository }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.googleK8sRepository" . }}/{{ .Values.image }} imagePullPolicy: "{{ .Values.pullPolicy }}" ports: - containerPort: {{ .Values.service.peerInternalPort }} diff --git a/kubernetes/common/etcd/values.yaml b/kubernetes/common/etcd/values.yaml index d994f87ea4..3cfd4535f1 100644 --- a/kubernetes/common/etcd/values.yaml +++ b/kubernetes/common/etcd/values.yaml @@ -24,8 +24,7 @@ global: ################################################################# #repository: etcd -repository: "k8s.gcr.io" -image: "etcd-amd64:3.2.24" +image: etcd-amd64:3.2.24 pullPolicy: Always # default number of instances in the StatefulSet |