Add repository component (path) to images and remove redundant "quote…

…" component (#5)
omec-project · Feb 19, 2024 · 0d6e9c8 · 0d6e9c8
1 parent aadb0a9
commit 0d6e9c8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/bess-upf/templates/statefulset-upf.yaml b/bess-upf/templates/statefulset-upf.yaml
@@ -55,8 +55,8 @@ spec:
     {{- end }}
       initContainers:
       - name: bess-init
-        image: {{ .Values.images.tags.bess | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.bess }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ["sh", "-xec"]
         args:
         - ip route replace {{ .Values.config.upf.enb.subnet }} via {{ .Values.config.upf.access.gateway }};
@@ -81,8 +81,8 @@ spec:
     {{- end }}
       containers:
       - name: bessd
-        image: {{ .Values.images.tags.bess | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.bess }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
         securityContext:
         {{- if .Values.config.upf.privileged }}
           privileged: true
@@ -157,8 +157,8 @@ spec:
             mountPath: /tmp/coredump
         {{- end }}
       - name: routectl
-        image: {{ .Values.images.tags.bess | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.bess }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
         env:
           - name: PYTHONUNBUFFERED
             value: "1"
@@ -172,16 +172,16 @@ spec:
 {{ toYaml .Values.resources.routectl | indent 10 }}
       {{- end }}
       - name: web
-        image: {{ .Values.images.tags.bess | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.bess }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ["/bin/bash", "-xc", "bessctl http 0.0.0.0 8000"]
       {{- if .Values.resources.enabled }}
         resources:
 {{ toYaml .Values.resources.web | indent 10 }}
       {{- end }}
       - name: pfcp-agent
-        image: {{ .Values.images.tags.pfcpiface | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.pfcpiface }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ["pfcpiface"]
         args:
           - -config
@@ -197,8 +197,8 @@ spec:
             mountPath: /tmp/conf
     {{- if .Values.config.gratuitousArp.enabled }}
       - name: arping
-        image: {{ .Values.images.tags.tools | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.tools }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ["sh", "-xc"]
         args:
           - |

diff --git a/bess-upf/values.yaml b/bess-upf/values.yaml
@@ -3,10 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 images:
+  repository: "" #default docker hub
   tags:
-    bess: "omecproject/upf-epc-bess:master-5786085"
-    pfcpiface: "omecproject/upf-epc-pfcpiface:master-5786085"
-    tools: registry.aetherproject.org/tools/busybox:stable
+    bess: omecproject/upf-epc-bess:master-5786085
+    pfcpiface: omecproject/upf-epc-pfcpiface:master-5786085
+    tools: busybox:stable
   pullPolicy: IfNotPresent
   # Secrets must be manually created in the namespace.
   pullSecrets: