Enable using existing image pull secret
Change-Id: I3f9412b04532ce5993fff18900021c24e5e096b5
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/secret-registry.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/secret-registry.yaml
deleted file mode 100644
index 1502049..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/secret-registry.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- if .Values.images.credentials }}
----
-kind: Secret
-apiVersion: v1
-metadata:
- name: {{ .Release.Name }}.registry
- labels:
- release: {{ .Release.Name }}
-type: kubernetes.io/dockerconfigjson
-data:
- .dockerconfigjson: {{ printf `{"auths":{%s:{"auth":"%s"}}}` (.Values.images.credentials.registry | quote) (printf "%s:%s" .Values.images.credentials.username .Values.images.credentials.password | b64enc) | b64enc | quote }}
-{{- end }}
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-nats.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-nats.yaml
index 38157af..2da6848 100644
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-nats.yaml
+++ b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-nats.yaml
@@ -28,9 +28,9 @@
{{ .Values.nodeSelectors.accelleranCBRSCommon.label }}: {{ .Values.nodeSelectors.accelleranCBRSCommon.value }}
{{- end }}
serviceAccountName: accelleran-cbrs-nats
- {{- if .Values.images.credentials }}
+ {{- if hasKey .Values.images "pullSecrets" }}
imagePullSecrets:
- - name: {{ .Release.Name }}.registry
+{{ toYaml .Values.images.pullSecrets | indent 8 }}
{{- end }}
containers:
- name: nats
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-redis.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-redis.yaml
index ae87b35..4d3aa3b 100644
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-redis.yaml
+++ b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-redis.yaml
@@ -29,9 +29,9 @@
{{ .Values.nodeSelectors.accelleranCBRSCommon.label }}: {{ .Values.nodeSelectors.accelleranCBRSCommon.value }}
{{- end }}
serviceAccountName: accelleran-cbrs-redis
- {{- if .Values.images.credentials }}
+ {{- if hasKey .Values.images "pullSecrets" }}
imagePullSecrets:
- - name: {{ .Release.Name }}.registry
+{{ toYaml .Values.images.pullSecrets | indent 8 }}
{{- end }}
containers:
- name: redis
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ric.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ric.yaml
index 0bc589c..44dfabd 100644
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ric.yaml
+++ b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ric.yaml
@@ -30,9 +30,9 @@
{{ .Values.nodeSelectors.accelleranCBRSCommon.label }}: {{ .Values.nodeSelectors.accelleranCBRSCommon.value }}
{{- end }}
serviceAccountName: accelleran-cbrs-ric
- {{- if .Values.images.credentials }}
+ {{- if hasKey .Values.images "pullSecrets" }}
imagePullSecrets:
- - name: {{ .Release.Name }}.registry
+{{ toYaml .Values.images.pullSecrets | indent 8 }}
{{- end }}
initContainers:
- name: redis-init-dep-check
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ricweb.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ricweb.yaml
index 7152ede..7b3248b 100644
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ricweb.yaml
+++ b/ran/accelleran-cbrs/accelleran-cbrs-common/templates/statefulset-accelleran-cbrs-ricweb.yaml
@@ -29,9 +29,9 @@
nodeSelector:
{{ .Values.nodeSelectors.accelleranCBRSCommon.label }}: {{ .Values.nodeSelectors.accelleranCBRSCommon.value }}
{{- end }}
- {{- if .Values.images.credentials }}
+ {{- if hasKey .Values.images "pullSecrets" }}
imagePullSecrets:
- - name: {{ .Release.Name }}.registry
+{{ toYaml .Values.images.pullSecrets | indent 8 }}
{{- end }}
initContainers:
- name: accelleran-cbrs-ric-dep-check