From 8dad60ee7b336489d5d651459e789c66f9f1a16c Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Fri, 23 Sep 2022 16:55:59 +0200
Subject: [PATCH] shrink chart definitions

---
 .../charts/dlsim.100rb+tm2/templates/deployment.yaml     | 1 -
 charts/physims/charts/dlsim.100rb+tm2/values.yaml        | 5 -----
 .../physims/charts/dlsim.basic/templates/deployment.yaml | 1 -
 charts/physims/charts/dlsim.basic/values.yaml            | 5 -----
 charts/physims/charts/ldpctest/templates/deployment.yaml | 1 -
 charts/physims/charts/ldpctest/values.yaml               | 5 -----
 .../physims/charts/nr-dlschsim/templates/deployment.yaml | 1 -
 charts/physims/charts/nr-dlschsim/values.yaml            | 5 -----
 .../charts/nr-dlsim.basic/templates/deployment.yaml      | 1 -
 charts/physims/charts/nr-dlsim.basic/values.yaml         | 5 -----
 .../charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml  | 1 -
 charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml     | 5 -----
 .../charts/nr-dlsim.mcs+mimo/templates/deployment.yaml   | 1 -
 charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml      | 5 -----
 charts/physims/charts/nr-dlsim.offset/values.yaml        | 5 -----
 .../charts/nr-pbchsim.106rb/templates/deployment.yaml    | 1 -
 charts/physims/charts/nr-pbchsim.106rb/values.yaml       | 5 -----
 .../charts/nr-pbchsim.217rb/templates/deployment.yaml    | 1 -
 charts/physims/charts/nr-pbchsim.217rb/values.yaml       | 5 -----
 .../charts/nr-pbchsim.273rb/templates/deployment.yaml    | 1 -
 charts/physims/charts/nr-pbchsim.273rb/values.yaml       | 5 -----
 .../physims/charts/nr-prachsim/templates/deployment.yaml | 1 -
 charts/physims/charts/nr-prachsim/values.yaml            | 5 -----
 .../physims/charts/nr-pucchsim/templates/deployment.yaml | 1 -
 charts/physims/charts/nr-pucchsim/values.yaml            | 5 -----
 .../physims/charts/nr-ulschsim/templates/deployment.yaml | 1 -
 charts/physims/charts/nr-ulschsim/values.yaml            | 5 -----
 .../charts/nr-ulsim.3gpp/templates/deployment.yaml       | 1 -
 charts/physims/charts/nr-ulsim.3gpp/values.yaml          | 5 -----
 .../charts/nr-ulsim.mimo/templates/deployment.yaml       | 1 -
 charts/physims/charts/nr-ulsim.mimo/values.yaml          | 5 -----
 .../charts/nr-ulsim.misc/templates/deployment.yaml       | 1 -
 charts/physims/charts/nr-ulsim.misc/values.yaml          | 5 -----
 .../charts/nr-ulsim.sc-fdma/templates/deployment.yaml    | 1 -
 charts/physims/charts/nr-ulsim.sc-fdma/values.yaml       | 5 -----
 .../physims/charts/polartest/templates/deployment.yaml   | 1 -
 charts/physims/charts/polartest/values.yaml              | 5 -----
 .../charts/smallblocktest/templates/deployment.yaml      | 1 -
 charts/physims/charts/smallblocktest/values.yaml         | 5 -----
 charts/physims/charts/ulsim/templates/deployment.yaml    | 1 -
 charts/physims/charts/ulsim/values.yaml                  | 5 -----
 charts/physims/values.yaml                               | 9 ++++++---
 42 files changed, 6 insertions(+), 128 deletions(-)

diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml
index 1339f4dcc0d..88bf277a033 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-dlsim-100rb
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/dlsim.100rb+tm2/values.yaml b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
index 9b60e29f308..f3d1aa3d743 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/values.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/dlsim.basic/templates/deployment.yaml b/charts/physims/charts/dlsim.basic/templates/deployment.yaml
index 168b58748aa..f74f5047275 100644
--- a/charts/physims/charts/dlsim.basic/templates/deployment.yaml
+++ b/charts/physims/charts/dlsim.basic/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-dlsim-basic
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/dlsim.basic/values.yaml b/charts/physims/charts/dlsim.basic/values.yaml
index bb63644c2b3..e36679ec2b7 100644
--- a/charts/physims/charts/dlsim.basic/values.yaml
+++ b/charts/physims/charts/dlsim.basic/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/ldpctest/templates/deployment.yaml b/charts/physims/charts/ldpctest/templates/deployment.yaml
index 74f78e7a0b4..8df3df5c462 100644
--- a/charts/physims/charts/ldpctest/templates/deployment.yaml
+++ b/charts/physims/charts/ldpctest/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-ldpctest
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/ldpctest/values.yaml b/charts/physims/charts/ldpctest/values.yaml
index b3cc476cf86..0ac20e6dd37 100644
--- a/charts/physims/charts/ldpctest/values.yaml
+++ b/charts/physims/charts/ldpctest/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-dlschsim/templates/deployment.yaml b/charts/physims/charts/nr-dlschsim/templates/deployment.yaml
index cfe5c1f6153..1016dbef560 100644
--- a/charts/physims/charts/nr-dlschsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlschsim/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-dlschsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-dlschsim/values.yaml b/charts/physims/charts/nr-dlschsim/values.yaml
index b7ef28f47a7..cb32095f764 100644
--- a/charts/physims/charts/nr-dlschsim/values.yaml
+++ b/charts/physims/charts/nr-dlschsim/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/deployment.yaml b/charts/physims/charts/nr-dlsim.basic/templates/deployment.yaml
index 2337ad98fd5..72ae0406d0f 100644
--- a/charts/physims/charts/nr-dlsim.basic/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-dlsim-ba
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-dlsim.basic/values.yaml b/charts/physims/charts/nr-dlsim.basic/values.yaml
index 9829ecf2566..4b9db13d7ee 100644
--- a/charts/physims/charts/nr-dlsim.basic/values.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml
index dc3ebb34d6e..847a1e1aee0 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-dlsim-dm
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
index c414d58132a..8c1814f19dc 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/deployment.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/deployment.yaml
index 5d38cf21c0f..c79eaf01a2d 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/deployment.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-dlsim-mc
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
index cdc58817d90..5bb48ad15db 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-dlsim.offset/values.yaml b/charts/physims/charts/nr-dlsim.offset/values.yaml
index 2c15b204102..40c1a94efe3 100644
--- a/charts/physims/charts/nr-dlsim.offset/values.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/deployment.yaml b/charts/physims/charts/nr-pbchsim.106rb/templates/deployment.yaml
index b9c5cfdd792..ed0f8f15707 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-pbchsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-pbchsim.106rb/values.yaml b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
index 5a3846b2deb..5632762245e 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/deployment.yaml b/charts/physims/charts/nr-pbchsim.217rb/templates/deployment.yaml
index 81f23745bd4..513443deaa3 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-pbchsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-pbchsim.217rb/values.yaml b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
index b23186f267d..7b44b982de5 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/deployment.yaml b/charts/physims/charts/nr-pbchsim.273rb/templates/deployment.yaml
index d0eb02d1f82..512e212c073 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-pbchsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-pbchsim.273rb/values.yaml b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
index a17d3297d8e..9cb5f6ebb5f 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-prachsim/templates/deployment.yaml b/charts/physims/charts/nr-prachsim/templates/deployment.yaml
index fb1a4ac61e1..6bea044b86c 100644
--- a/charts/physims/charts/nr-prachsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-prachsim/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-prachsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-prachsim/values.yaml b/charts/physims/charts/nr-prachsim/values.yaml
index dba6cc16c07..93789de637e 100644
--- a/charts/physims/charts/nr-prachsim/values.yaml
+++ b/charts/physims/charts/nr-prachsim/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-pucchsim/templates/deployment.yaml b/charts/physims/charts/nr-pucchsim/templates/deployment.yaml
index 2159b3935d6..fce72ebc352 100644
--- a/charts/physims/charts/nr-pucchsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-pucchsim/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-pucchsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-pucchsim/values.yaml b/charts/physims/charts/nr-pucchsim/values.yaml
index 77fe0963ac2..d4c869278b8 100644
--- a/charts/physims/charts/nr-pucchsim/values.yaml
+++ b/charts/physims/charts/nr-pucchsim/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-ulschsim/templates/deployment.yaml b/charts/physims/charts/nr-ulschsim/templates/deployment.yaml
index 8ca812bf408..d44b2b64635 100644
--- a/charts/physims/charts/nr-ulschsim/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulschsim/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-ulschsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-ulschsim/values.yaml b/charts/physims/charts/nr-ulschsim/values.yaml
index efb011a7f65..b0529c818d9 100644
--- a/charts/physims/charts/nr-ulschsim/values.yaml
+++ b/charts/physims/charts/nr-ulschsim/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.3gpp/templates/deployment.yaml
index 801252e0ea5..7bf59eed4f9 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-ulsim-3g
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-ulsim.3gpp/values.yaml b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
index ab68afd7123..3d44bda9b85 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/values.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.mimo/templates/deployment.yaml
index c21b151ad10..e8d6ecf7ce3 100644
--- a/charts/physims/charts/nr-ulsim.mimo/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-ulsim-mi
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-ulsim.mimo/values.yaml b/charts/physims/charts/nr-ulsim.mimo/values.yaml
index 6eab0521e10..55bdcd61587 100644
--- a/charts/physims/charts/nr-ulsim.mimo/values.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.misc/templates/deployment.yaml
index 0987e041e0b..56c25fbbc36 100644
--- a/charts/physims/charts/nr-ulsim.misc/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-ulsim-mi
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-ulsim.misc/values.yaml b/charts/physims/charts/nr-ulsim.misc/values.yaml
index e45dc95be5f..dcae7a2b66c 100644
--- a/charts/physims/charts/nr-ulsim.misc/values.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/deployment.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/templates/deployment.yaml
index 5e487770203..3119950e20c 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/deployment.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-nr-ulsim-sc
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
index e75785772ba..0536fb03b6e 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/polartest/templates/deployment.yaml b/charts/physims/charts/polartest/templates/deployment.yaml
index ccb860ee981..20dac8ebf7a 100644
--- a/charts/physims/charts/polartest/templates/deployment.yaml
+++ b/charts/physims/charts/polartest/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-polartest
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/polartest/values.yaml b/charts/physims/charts/polartest/values.yaml
index e0751e8ec48..f7195dd5727 100644
--- a/charts/physims/charts/polartest/values.yaml
+++ b/charts/physims/charts/polartest/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/smallblocktest/templates/deployment.yaml b/charts/physims/charts/smallblocktest/templates/deployment.yaml
index 2fe4a025a64..aafb16e054f 100644
--- a/charts/physims/charts/smallblocktest/templates/deployment.yaml
+++ b/charts/physims/charts/smallblocktest/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-smallblock
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/smallblocktest/values.yaml b/charts/physims/charts/smallblocktest/values.yaml
index f933a978fd2..f08db5501a9 100644
--- a/charts/physims/charts/smallblocktest/values.yaml
+++ b/charts/physims/charts/smallblocktest/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/charts/ulsim/templates/deployment.yaml b/charts/physims/charts/ulsim/templates/deployment.yaml
index c7a10c04487..3185b074b25 100644
--- a/charts/physims/charts/ulsim/templates/deployment.yaml
+++ b/charts/physims/charts/ulsim/templates/deployment.yaml
@@ -30,7 +30,6 @@ spec:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
         - containerPort: 80
-          name: oai-ulsim
         env:
         - name: OPENAIR_DIR
           value: /opt/oai-physim
diff --git a/charts/physims/charts/ulsim/values.yaml b/charts/physims/charts/ulsim/values.yaml
index d25b6fc2a53..3e625f02c6e 100644
--- a/charts/physims/charts/ulsim/values.yaml
+++ b/charts/physims/charts/ulsim/values.yaml
@@ -4,12 +4,7 @@
 
 replicaCount: 1
 
-namespace: "OAICICD_PROJECT"
-
 image:
-  registry: local
-  repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-  version: temp
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: Always
 
diff --git a/charts/physims/values.yaml b/charts/physims/values.yaml
index a4581465f13..70923badc52 100644
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -4,10 +4,13 @@
 
 global:
   serviceAccountName: oai-physim-sa
-  namespace: "OAICICD_PROJECT"
+  namespace: "oaicicd-ran"
   image:
-    repository: image-registry.openshift-image-registry.svc:5000/OAICICD_PROJECT/oai-physim
-    version: TAG
+    registry: local
+    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran/oai-physim
+    version: ci-physim-cleanup
+    # pullPolicy: IfNotPresent or Never or Always
+    pullPolicy: Always
 
 ## Declaring values specific to coressponding physim to overwrite
 
-- 
GitLab