Enable using existing image pull secret
Change-Id: I3f9412b04532ce5993fff18900021c24e5e096b5
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/Chart.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/Chart.yaml
index aa7bbdc..6d7be77 100644
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/Chart.yaml
+++ b/ran/accelleran-cbrs/accelleran-cbrs-common/Chart.yaml
@@ -9,4 +9,4 @@
description: A Helm chart to install Accelleran common to run Accelleran CU on CBRS band
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.2.2
+version: 0.2.3
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
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-common/values.yaml b/ran/accelleran-cbrs/accelleran-cbrs-common/values.yaml
index 0a4287d..df1613b 100644
--- a/ran/accelleran-cbrs/accelleran-cbrs-common/values.yaml
+++ b/ran/accelleran-cbrs/accelleran-cbrs-common/values.yaml
@@ -4,19 +4,16 @@
images:
tags:
- initCU: docker.io/omecproject/pod-init:1.0.0
- nats: registry.aetherproject.org/accelleran/accelleran-cu-nats:v1.0.0
- redis: registry.aetherproject.org/accelleran/accelleran-cu-redis:v1.0.0
- redisClient: docker.io/redis:5.0.6-alpine3.10
- ric: registry.aetherproject.org/accelleran/accelleran-cu-ric:v1.0.0
- ricWeb: registry.aetherproject.org/accelleran/accelleran-cu-ricweb:v1.0.0
- depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
+ initCU: "registry.aetherproject.org/accelleran/pod-init:1.0.0"
+ nats: "registry.aetherproject.org/accelleran/accelleran-cu-nats:v1.0.0"
+ redis: "registry.aetherproject.org/accelleran/accelleran-cu-redis:v1.0.0"
+ redisClient: "docker.io/redis:5.0.6-alpine3.10"
+ ric: "registry.aetherproject.org/accelleran/accelleran-cu-ric:v1.0.0"
+ ricWeb: "registry.aetherproject.org/accelleran/accelleran-cu-ricweb:v1.0.0"
+ depCheck: "quay.io/stackanetes/kubernetes-entrypoint:v0.3.1"
pullPolicy: IfNotPresent
- credentials: {}
- # If specified, use this credential to access the image
- # registry:
- # username:
- # password:
+ pullSecrets:
+ - name: aether.registry
nodeSelectors:
enabled: false
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-cu/Chart.yaml b/ran/accelleran-cbrs/accelleran-cbrs-cu/Chart.yaml
index 5134f6b..40254f9 100644
--- a/ran/accelleran-cbrs/accelleran-cbrs-cu/Chart.yaml
+++ b/ran/accelleran-cbrs/accelleran-cbrs-cu/Chart.yaml
@@ -9,4 +9,4 @@
description: A Helm chart to install Accelleran CU on CBRS band
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.1.10
+version: 0.1.11
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/secret-registry.yaml b/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/secret-registry.yaml
deleted file mode 100644
index 1502049..0000000
--- a/ran/accelleran-cbrs/accelleran-cbrs-cu/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-cu/templates/statefulset-accelleran-cbrs-cu.yaml b/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/statefulset-accelleran-cbrs-cu.yaml
index a116822..1efc9c6 100644
--- a/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/statefulset-accelleran-cbrs-cu.yaml
+++ b/ran/accelleran-cbrs/accelleran-cbrs-cu/templates/statefulset-accelleran-cbrs-cu.yaml
@@ -29,9 +29,9 @@
nodeSelector:
{{ .Values.nodeSelectors.accelleranCBRSCU.label }}: {{ .Values.nodeSelectors.accelleranCBRSCU.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: cu-init
diff --git a/ran/accelleran-cbrs/accelleran-cbrs-cu/values.yaml b/ran/accelleran-cbrs/accelleran-cbrs-cu/values.yaml
index d085326..b2e746b 100644
--- a/ran/accelleran-cbrs/accelleran-cbrs-cu/values.yaml
+++ b/ran/accelleran-cbrs/accelleran-cbrs-cu/values.yaml
@@ -4,15 +4,12 @@
images:
tags:
- initCU: docker.io/omecproject/pod-init:1.0.0
- vranL3: registry.aetherproject.org/accelleran/accelleran-cu-l3-tdd:v1.0.2
- depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
+ initCU: "registry.aetherproject.org/accelleran/pod-init:1.0.0"
+ vranL3: "registry.aetherproject.org/accelleran/accelleran-cu-l3-tdd:v1.0.2"
+ depCheck: "quay.io/stackanetes/kubernetes-entrypoint:v0.3.1"
pullPolicy: IfNotPresent
- credentials: {}
- # If specified, use this credential to access the image
- # registry:
- # username:
- # password:
+ pullSecrets:
+ - name: aether.registry
nodeSelectors:
enabled: false