Use the staging release image as default
Also, use the existing image pull secret
Change-Id: Ia92b116c7127a8e6d619cff2418d827d47779521
diff --git a/omec/omec-upf-pfcp-agent/Chart.yaml b/omec/omec-upf-pfcp-agent/Chart.yaml
index 2d1988c..6e9516d 100644
--- a/omec/omec-upf-pfcp-agent/Chart.yaml
+++ b/omec/omec-upf-pfcp-agent/Chart.yaml
@@ -7,4 +7,4 @@
name: omec-upf-pfcp-agent
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.1.4
+version: 0.1.5
diff --git a/omec/omec-upf-pfcp-agent/templates/secret-registry.yaml b/omec/omec-upf-pfcp-agent/templates/secret-registry.yaml
deleted file mode 100644
index 1502049..0000000
--- a/omec/omec-upf-pfcp-agent/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-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml b/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml
index 002a6ac..5ee03b0 100644
--- a/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml
+++ b/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml
@@ -28,9 +28,9 @@
nodeSelector:
{{ .Values.nodeSelectors.pfcp.label }}: {{ .Values.nodeSelectors.pfcp.value }}
{{- end }}
- {{- if .Values.images.credentials }}
+ {{- if hasKey .Values.images "pullSecrets" }}
imagePullSecrets:
- - name: {{ .Release.Name }}.registry
+{{ toYaml .Values.images.pullSecrets | indent 8 }}
{{- end }}
{{- if .Values.config.coreDump.enabled }}
initContainers:
diff --git a/omec/omec-upf-pfcp-agent/values.yaml b/omec/omec-upf-pfcp-agent/values.yaml
index ffbdf71..059db54 100644
--- a/omec/omec-upf-pfcp-agent/values.yaml
+++ b/omec/omec-upf-pfcp-agent/values.yaml
@@ -5,13 +5,11 @@
images:
tags:
init: docker.io/omecproject/pod-init:1.0.0
- pfcpiface: docker.io/omecproject/upf-epc-pfcpiface:up4
+ pfcpiface: registry.aetherproject.org/proxy/omecproject/upf-epc-pfcpiface:master-e3f53d5
pullPolicy: Always
- credentials: {}
- # If specified, use this credential to access the image
- # registry:
- # username:
- # password:
+ # Secrets must be manually created in the namespace.
+ pullSecrets:
+ - name: aether.registry
nodeSelectors:
enabled: false