Enable image pull secret for BESS UPF chart
Change-Id: I48eecb5d29462b286d78086ad677574a39065670
diff --git a/omec/omec-user-plane/Chart.yaml b/omec/omec-user-plane/Chart.yaml
index b2ccf0e..d47e2a8 100644
--- a/omec/omec-user-plane/Chart.yaml
+++ b/omec/omec-user-plane/Chart.yaml
@@ -7,4 +7,4 @@
name: omec-user-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.3.10
+version: 0.3.11
diff --git a/omec/omec-user-plane/templates/secret-registry.yaml b/omec/omec-user-plane/templates/secret-registry.yaml
deleted file mode 100644
index 1502049..0000000
--- a/omec/omec-user-plane/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/omec/omec-user-plane/templates/statefulset-upf.yaml b/omec/omec-user-plane/templates/statefulset-upf.yaml
index 3ac3239..0bf4cfa 100644
--- a/omec/omec-user-plane/templates/statefulset-upf.yaml
+++ b/omec/omec-user-plane/templates/statefulset-upf.yaml
@@ -49,9 +49,9 @@
nodeSelector:
{{ .Values.nodeSelectors.upf.label }}: {{ .Values.nodeSelectors.upf.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: bess-init
diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
index 0822a28..f8ba6cb 100644
--- a/omec/omec-user-plane/values.yaml
+++ b/omec/omec-user-plane/values.yaml
@@ -8,18 +8,17 @@
bess: docker.io/omecproject/upf-epc-bess:master-latest
pfcpiface: docker.io/omecproject/upf-epc-pfcpiface:master-latest
zmqiface: docker.io/omecproject/upf-epc-cpiface:master-latest
- pullPolicy: Always
- credentials: {}
- # If specified, use this credential to access the image
- # registry:
- # username:
- # password:
+ pullPolicy: IfNotPresent
+ # Optionally specify an array of imagePullSecrets.
+ # Secrets must be manually created in the namespace.
+ #pullSecrets:
+ # - name: aether.registry
nodeSelectors:
enabled: false
upf:
- label: omec-upf
- value: enabled
+ label: node-role.aetherproject.org
+ value: omec-upf
resources:
enabled: true
@@ -88,7 +87,7 @@
measure: true
bess:
web:
- nodePort: 36000
+ nodePort: 32001
cpiface:
# pfcp or zmq
mode: pfcp